PR#23: spec: Require just toolset on el>7 - rpms/rpm-ostree

rpms / rpm-ostree

#23 spec: Require just toolset on el>7

Merged 5 years ago by walters. Opened 5 years ago by walters.

rpms/ walters/rpm-ostree fix-buildreq into master

Colin Walters • 5 years ago

1f289f2

rpm-ostree.spec

file modified

+1 -1

		`@@ -31,13 +31,13 @@`
		`%if %{defined rusttoolset_version}`
		`BuildRequires: %{rusttoolset_version}-cargo`
		`%else`
		`- %endif # defined rusttoolset_version`
		`# This one is only in Fedora, we're not actually using it right now`
		`# but we may in the future.`
		`%if 0%{?fedora} >= 28`
		`BuildRequires: rust-packaging`
		`%endif`
		`BuildRequires: cargo`
		`+ %endif # defined rusttoolset_version`
		`%endif # with_rust`
		`# For the autofiles bits below`
		`BuildRequires: /usr/bin/python3`

walters commented 5 years ago

This was the cause of the stray %else\n%endif - there's only
BuildRequires: rust-toolset-1.26 there right now.

smilner commented 5 years ago

The change looks good, but there is a linking issue when building in koji ci (F30):

2018.7/target/release/librpmostree_rust.a -pthread
/usr/bin/ld: /builddir/build/BUILD/rpm-ostree-2018.7/target/release/librpmostree_rust.a(rpmostree_rust-19e83b900e7ca6d2.rpmostree_rust0.rcgu.o): undefined reference to symbol 'dladdr@@GLIBC_2.2.5'
/usr/bin/ld: /usr/lib/gcc/x86_64-redhat-linux/8/../../../../lib64/libdl.so: error adding symbols: DSO missing from command line
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile:2423: rpm-ostree] Error 1
make[2]: Leaving directory '/builddir/build/BUILD/rpm-ostree-2018.7'
make[1]: *** [Makefile:4182: all-recursive] Error 1
make[1]: Leaving directory '/builddir/build/BUILD/rpm-ostree-2018.7'
make: *** [Makefile:1746: all] Error 2