From 7c47af9e002b1ec68057ec96ac29c1597559bc91 Mon Sep 17 00:00:00 2001 From: Aaron Conole Date: Tue, 29 Sep 2015 16:19:33 -0400 Subject: [PATCH] dpdk.spec: Remove the combined build option The desired end effect of build is to have a combined library, and it will not be going away. The upstream combined library is considered bloatware which creates issues when library versions start moving, so force the issue by using linker script instead. Signed-off-by: Aaron Conole Acked-by: Neil Horman Acked-by: Panu Matilainen --- dpdk.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dpdk.spec b/dpdk.spec index 38d5279..7e82c94 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -1,5 +1,3 @@ -# Add option to enable combined library (--with combined) -%bcond_with combined # Add option to build as static libraries (--without shared) %bcond_without shared # Add option to build without tools @@ -163,10 +161,11 @@ EOF # Fixup irregular modes in headers find %{buildroot}%{_includedir}/%{name}-%{version} -type f | xargs chmod 0644 -# Upstream has an option to build a combined library but it'll clash -# with symbol/library versioning once it lands. Use a linker script to -# avoid the issue. -%if %{with combined} +# Upstream has an option to build a combined library but it's bloatware which +# wont work at all when library versions start moving, replace it with a +# linker script which avoids these issues. Linking against the script during +# build resolves into links to the actual used libraries which is just fine +# for us, so this combined library is a build-time only construct now. %if %{with shared} libext=so @@ -181,7 +180,6 @@ find %{buildroot}/%{_libdir}/%{name}-%{version}/ -name "*.${libext}" |\ sed -e "s:^%{buildroot}/: :g" >> ${comblib} echo ")" >> ${comblib} install -m 644 ${comblib} %{buildroot}/%{_libdir}/%{name}-%{version}/${comblib} -%endif %files # BSD