Move gnutls, zlib, bzip2, lz4, xz, and zstd to bconds
This commit is contained in:
parent
c50dc7ccda
commit
379f9bfba1
29
systemd.spec
29
systemd.spec
@ -15,6 +15,13 @@
|
|||||||
%global elf_suffix ()%{elf_bits}
|
%global elf_suffix ()%{elf_bits}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%bcond bzip2 1
|
||||||
|
%bcond gnutls 1
|
||||||
|
%bcond lz4 1
|
||||||
|
%bcond xz 1
|
||||||
|
%bcond zlib 1
|
||||||
|
%bcond zstd 1
|
||||||
|
|
||||||
# Bootstrap may be needed to break circular dependencies with cryptsetup,
|
# Bootstrap may be needed to break circular dependencies with cryptsetup,
|
||||||
# e.g. when re-building cryptsetup on a json-c SONAME-bump.
|
# e.g. when re-building cryptsetup on a json-c SONAME-bump.
|
||||||
%bcond_with bootstrap
|
%bcond_with bootstrap
|
||||||
@ -129,18 +136,28 @@ BuildRequires: /usr/bin/getfacl
|
|||||||
BuildRequires: libacl-devel
|
BuildRequires: libacl-devel
|
||||||
BuildRequires: gobject-introspection-devel
|
BuildRequires: gobject-introspection-devel
|
||||||
BuildRequires: libblkid-devel
|
BuildRequires: libblkid-devel
|
||||||
|
%if %{with xz}
|
||||||
BuildRequires: xz-devel
|
BuildRequires: xz-devel
|
||||||
BuildRequires: xz
|
BuildRequires: xz
|
||||||
|
%endif
|
||||||
|
%if %{with lz4}
|
||||||
BuildRequires: lz4-devel
|
BuildRequires: lz4-devel
|
||||||
BuildRequires: lz4
|
BuildRequires: lz4
|
||||||
|
%endif
|
||||||
|
%if %{with bzip2}
|
||||||
BuildRequires: bzip2-devel
|
BuildRequires: bzip2-devel
|
||||||
|
%endif
|
||||||
|
%if %{with zstd}
|
||||||
BuildRequires: libzstd-devel
|
BuildRequires: libzstd-devel
|
||||||
|
%endif
|
||||||
BuildRequires: libidn2-devel
|
BuildRequires: libidn2-devel
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
BuildRequires: kmod-devel
|
BuildRequires: kmod-devel
|
||||||
BuildRequires: elfutils-devel
|
BuildRequires: elfutils-devel
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
|
%if %{with gnutls}
|
||||||
BuildRequires: gnutls-devel
|
BuildRequires: gnutls-devel
|
||||||
|
%endif
|
||||||
%if %{undefined rhel}
|
%if %{undefined rhel}
|
||||||
BuildRequires: qrencode-devel
|
BuildRequires: qrencode-devel
|
||||||
%endif
|
%endif
|
||||||
@ -578,11 +595,11 @@ CONFIGURE_OPTS=(
|
|||||||
-Dbpf-framework=%[0%{?have_bpf}?"true":"false"]
|
-Dbpf-framework=%[0%{?have_bpf}?"true":"false"]
|
||||||
-Dapparmor=false
|
-Dapparmor=false
|
||||||
-Dpolkit=true
|
-Dpolkit=true
|
||||||
-Dxz=true
|
-Dxz=%[%{with xz}?"true":"false"]
|
||||||
-Dzlib=true
|
-Dzlib=%[%{with zlib}?"true":"false"]
|
||||||
-Dbzip2=true
|
-Dbzip2=%[%{with bzip2}?"true":"false"]
|
||||||
-Dlz4=true
|
-Dlz4=%[%{with lz4}?"true":"false"]
|
||||||
-Dzstd=true
|
-Dzstd=%[%{with zstd}?"true":"false"]
|
||||||
-Dpam=true
|
-Dpam=true
|
||||||
-Dacl=true
|
-Dacl=true
|
||||||
-Dsmack=true
|
-Dsmack=true
|
||||||
@ -596,7 +613,7 @@ CONFIGURE_OPTS=(
|
|||||||
-Delfutils=true
|
-Delfutils=true
|
||||||
-Dpwquality=true
|
-Dpwquality=true
|
||||||
-Dqrencode=%[%{defined rhel}?"false":"true"]
|
-Dqrencode=%[%{defined rhel}?"false":"true"]
|
||||||
-Dgnutls=true
|
-Dgnutls=%[%{with gnutls}?"true":"false"]
|
||||||
-Dmicrohttpd=true
|
-Dmicrohttpd=true
|
||||||
-Dlibidn2=true
|
-Dlibidn2=true
|
||||||
-Dlibiptc=false
|
-Dlibiptc=false
|
||||||
|
Loading…
Reference in New Issue
Block a user