rpms/dpdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

dpdk.spec: Remove the combined build option

Browse Source 
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 <aconole@redhat.com>
Acked-by: Neil Horman <nhorman@redhat.com>
Acked-by: Panu Matilainen <pmatilai@redhat.com>
This commit is contained in:
Aaron Conole 2015-09-29 16:19:33 -04:00
parent f961f12771
commit 7c47af9e00
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dpdk.spec
View File

@ -1,5 +1,3 @@
# Add option to enable combined library (--with combined)
%bcond_with combined
# Add option to build as static libraries (--without shared) # Add option to build as static libraries (--without shared)
%bcond_without shared %bcond_without shared
# Add option to build without tools # Add option to build without tools
@ -163,10 +161,11 @@ EOF
# Fixup irregular modes in headers # Fixup irregular modes in headers
find %{buildroot}%{_includedir}/%{name}-%{version} -type f | xargs chmod 0644 find %{buildroot}%{_includedir}/%{name}-%{version} -type f | xargs chmod 0644
# Upstream has an option to build a combined library but it'll clash # Upstream has an option to build a combined library but it's bloatware which
# with symbol/library versioning once it lands. Use a linker script to # wont work at all when library versions start moving, replace it with a
# avoid the issue. # linker script which avoids these issues. Linking against the script during
%if %{with combined} # 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} %if %{with shared}
libext=so libext=so
@ -181,7 +180,6 @@ find %{buildroot}/%{_libdir}/%{name}-%{version}/ -name "*.${libext}" |\
sed -e "s:^%{buildroot}/: :g" >> ${comblib} sed -e "s:^%{buildroot}/: :g" >> ${comblib}
echo ")" >> ${comblib} echo ")" >> ${comblib}
install -m 644 ${comblib} %{buildroot}/%{_libdir}/%{name}-%{version}/${comblib} install -m 644 ${comblib} %{buildroot}/%{_libdir}/%{name}-%{version}/${comblib}
%endif
%files %files
# BSD # BSD