mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-22 19:32:19 +00:00
libvirt.spec.in: remove libpcap conditional
Both RHEL and Fedora build with libpcap at all times. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
01e681c49f
commit
4c6c4ca40e
@ -72,7 +72,6 @@
|
|||||||
|
|
||||||
# A few optional bits off by default, we enable later
|
# A few optional bits off by default, we enable later
|
||||||
%define with_fuse 0%{!?_without_fuse:0}
|
%define with_fuse 0%{!?_without_fuse:0}
|
||||||
%define with_libpcap 0%{!?_without_libpcap:0}
|
|
||||||
%define with_macvtap 0%{!?_without_macvtap:0}
|
%define with_macvtap 0%{!?_without_macvtap:0}
|
||||||
%define with_libnl 0%{!?_without_libnl:0}
|
%define with_libnl 0%{!?_without_libnl:0}
|
||||||
%define with_cgconfig 0%{!?_without_cgconfig:0}
|
%define with_cgconfig 0%{!?_without_cgconfig:0}
|
||||||
@ -182,8 +181,6 @@
|
|||||||
|
|
||||||
|
|
||||||
%if %{with_qemu} || %{with_lxc} || %{with_uml}
|
%if %{with_qemu} || %{with_lxc} || %{with_uml}
|
||||||
# Enable libpcap library
|
|
||||||
%define with_libpcap 0%{!?_without_libpcap:1}
|
|
||||||
%define with_macvtap 0%{!?_without_macvtap:1}
|
%define with_macvtap 0%{!?_without_macvtap:1}
|
||||||
|
|
||||||
# numad is used to manage the CPU and memory placement dynamically,
|
# numad is used to manage the CPU and memory placement dynamically,
|
||||||
@ -321,9 +318,7 @@ BuildRequires: yajl-devel
|
|||||||
%if %{with_sanlock}
|
%if %{with_sanlock}
|
||||||
BuildRequires: sanlock-devel >= 2.4
|
BuildRequires: sanlock-devel >= 2.4
|
||||||
%endif
|
%endif
|
||||||
%if %{with_libpcap}
|
|
||||||
BuildRequires: libpcap-devel
|
BuildRequires: libpcap-devel
|
||||||
%endif
|
|
||||||
%if %{with_libnl}
|
%if %{with_libnl}
|
||||||
BuildRequires: libnl3-devel
|
BuildRequires: libnl3-devel
|
||||||
%endif
|
%endif
|
||||||
@ -1037,10 +1032,6 @@ rm -rf .git
|
|||||||
%define _without_sanlock --without-sanlock
|
%define _without_sanlock --without-sanlock
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if ! %{with_libpcap}
|
|
||||||
%define _without_libpcap --without-libpcap
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if ! %{with_macvtap}
|
%if ! %{with_macvtap}
|
||||||
%define _without_macvtap --without-macvtap
|
%define _without_macvtap --without-macvtap
|
||||||
%endif
|
%endif
|
||||||
@ -1130,7 +1121,7 @@ rm -f po/stamp-po
|
|||||||
--with-udev \
|
--with-udev \
|
||||||
--with-yajl \
|
--with-yajl \
|
||||||
%{?_without_sanlock} \
|
%{?_without_sanlock} \
|
||||||
%{?_without_libpcap} \
|
--with-libpcap \
|
||||||
%{?_without_macvtap} \
|
%{?_without_macvtap} \
|
||||||
--with-audit \
|
--with-audit \
|
||||||
--with-dtrace \
|
--with-dtrace \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user