rpms/s390utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

unconditionally build with rust

Browse Source
This commit is contained in:
Dan Horák 2024-02-05 11:25:21 +00:00
parent 0226a1b211
commit 882b26e468
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
s390utils.spec
View File

@ -11,8 +11,6 @@
%bcond_with pandoc %bcond_with pandoc
%endif %endif
%bcond_without rust
Name: s390utils Name: s390utils
Summary: Utilities and daemons for IBM z Systems Summary: Utilities and daemons for IBM z Systems
Version: 2.31.0 Version: 2.31.0
@ -75,7 +73,6 @@ Requires: s390utils-se-data = %{epoch}:%{version}-%{release}
BuildRequires: make BuildRequires: make
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: glib2-devel BuildRequires: glib2-devel
%if %{with rust}
%if 0%{?rhel} %if 0%{?rhel}
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
@ -108,7 +105,6 @@ BuildRequires: crate(thiserror)
BuildRequires: crate(zerocopy) BuildRequires: crate(zerocopy)
BuildRequires: rust-packaging BuildRequires: rust-packaging
%endif %endif
%endif
%description %description
This is a meta package for installing the default s390-tools sub packages. This is a meta package for installing the default s390-tools sub packages.
@ -121,7 +117,6 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
%prep %prep
%autosetup -n s390-tools-%{version} -p1 %autosetup -n s390-tools-%{version} -p1
%if %{with rust}
%if 0%{?rhel} %if 0%{?rhel}
pushd rust pushd rust
%cargo_prep -V 1 %cargo_prep -V 1
@ -130,15 +125,11 @@ popd
%cargo_prep %cargo_prep
%endif %endif
rm ./rust/Cargo.lock rm ./rust/Cargo.lock
%endif
%build %build
make \ make \
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \ CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
HAVE_DRACUT=1 \ HAVE_DRACUT=1 \
%if %{without rust}
HAVE_CARGO=0 \
%endif
%if %{with pandoc} %if %{with pandoc}
ENABLE_DOC=1 \ ENABLE_DOC=1 \
%endif %endif
@ -151,9 +142,6 @@ make \
%install %install
make install \ make install \
HAVE_DRACUT=1 \ HAVE_DRACUT=1 \
%if %{without rust}
HAVE_CARGO=0 \
%endif
%if %{with pandoc} %if %{with pandoc}
ENABLE_DOC=1 \ ENABLE_DOC=1 \
%endif %endif
@ -244,23 +232,16 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf
%doc README.md %doc README.md
%license LICENSE %license LICENSE
%{_bindir}/genprotimg %{_bindir}/genprotimg
%if %{with rust}
%{_bindir}/pvapconfig %{_bindir}/pvapconfig
%endif
%{_bindir}/pvattest %{_bindir}/pvattest
%{_bindir}/pvextract-hdr %{_bindir}/pvextract-hdr
%if %{with rust}
%{_bindir}/pvsecret %{_bindir}/pvsecret
%endif
%{_mandir}/man1/genprotimg.1* %{_mandir}/man1/genprotimg.1*
%if %{with rust}
%{_mandir}/man1/pvapconfig.1* %{_mandir}/man1/pvapconfig.1*
%endif
%{_mandir}/man1/pvattest.1* %{_mandir}/man1/pvattest.1*
%{_mandir}/man1/pvattest-create.1* %{_mandir}/man1/pvattest-create.1*
%{_mandir}/man1/pvattest-perform.1* %{_mandir}/man1/pvattest-perform.1*
%{_mandir}/man1/pvattest-verify.1* %{_mandir}/man1/pvattest-verify.1*
%if %{with rust}
%{_mandir}/man1/pvsecret-add.1* %{_mandir}/man1/pvsecret-add.1*
%{_mandir}/man1/pvsecret-create-association.1* %{_mandir}/man1/pvsecret-create-association.1*
%{_mandir}/man1/pvsecret-create-meta.1* %{_mandir}/man1/pvsecret-create-meta.1*
@ -269,7 +250,6 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf
%{_mandir}/man1/pvsecret-lock.1* %{_mandir}/man1/pvsecret-lock.1*
%{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret-verify.1*
%{_mandir}/man1/pvsecret.1* %{_mandir}/man1/pvsecret.1*
%endif
%dir %{_datadir}/s390-tools %dir %{_datadir}/s390-tools
%{_datadir}/s390-tools/genprotimg/ %{_datadir}/s390-tools/genprotimg/
@ -592,15 +572,11 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_sbindir}/zpcictl %{_sbindir}/zpcictl
%{_bindir}/dump2tar %{_bindir}/dump2tar
%{_bindir}/genprotimg %{_bindir}/genprotimg
%if %{with rust}
%{_bindir}/pvapconfig %{_bindir}/pvapconfig
%endif
%{_bindir}/mk-s390image %{_bindir}/mk-s390image
%{_bindir}/pvattest %{_bindir}/pvattest
%{_bindir}/pvextract-hdr %{_bindir}/pvextract-hdr
%if %{with rust}
%{_bindir}/pvsecret %{_bindir}/pvsecret
%endif
%{_bindir}/zkey %{_bindir}/zkey
%{_bindir}/zkey-cryptsetup %{_bindir}/zkey-cryptsetup
%{_unitdir}/dumpconf.service %{_unitdir}/dumpconf.service
@ -625,14 +601,11 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_libdir}/zkey/zkey-kmip.so %{_libdir}/zkey/zkey-kmip.so
%{_mandir}/man1/dump2tar.1* %{_mandir}/man1/dump2tar.1*
%{_mandir}/man1/genprotimg.1* %{_mandir}/man1/genprotimg.1*
%if %{with rust}
%{_mandir}/man1/pvapconfig.1* %{_mandir}/man1/pvapconfig.1*
%endif
%{_mandir}/man1/pvattest.1* %{_mandir}/man1/pvattest.1*
%{_mandir}/man1/pvattest-create.1* %{_mandir}/man1/pvattest-create.1*
%{_mandir}/man1/pvattest-perform.1* %{_mandir}/man1/pvattest-perform.1*
%{_mandir}/man1/pvattest-verify.1* %{_mandir}/man1/pvattest-verify.1*
%if %{with rust}
%{_mandir}/man1/pvsecret-add.1* %{_mandir}/man1/pvsecret-add.1*
%{_mandir}/man1/pvsecret-create-association.1* %{_mandir}/man1/pvsecret-create-association.1*
%{_mandir}/man1/pvsecret-create-meta.1* %{_mandir}/man1/pvsecret-create-meta.1*
@ -641,7 +614,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_mandir}/man1/pvsecret-lock.1* %{_mandir}/man1/pvsecret-lock.1*
%{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret-verify.1*
%{_mandir}/man1/pvsecret.1* %{_mandir}/man1/pvsecret.1*
%endif
%{_mandir}/man1/zkey.1* %{_mandir}/man1/zkey.1*
%{_mandir}/man1/zkey-cryptsetup.1* %{_mandir}/man1/zkey-cryptsetup.1*
%{_mandir}/man1/zkey-ekmfweb.1* %{_mandir}/man1/zkey-ekmfweb.1*