[packages/boost] use find instead of explicit paths

atler atler at pld-linux.org
Fri Jan 14 17:05:40 CET 2022


commit e9018ce0611f26c8f4b4de42381eecb3cfcfd52b
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Jan 14 17:03:26 2022 +0100

    use find instead of explicit paths
    
    for whatever reason x32 paths contain abi-x32 part for fiber but not for
    stacktrace

 boost.spec | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
---
diff --git a/boost.spec b/boost.spec
index 6e5bca1..1e457eb 100644
--- a/boost.spec
+++ b/boost.spec
@@ -59,12 +59,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		py3v_suffix "m"
 %endif
 
-%ifarch x32
-%define		boost_buildsubdir	build/*/release/address-model-64
-%else
-%define		boost_buildsubdir	build/*/release/
-%endif
-
 %description
 The Boost web site provides free peer-reviewed portable C++ source
 libraries. The emphasis is on libraries which work well with the C++
@@ -569,10 +563,7 @@ install -p stage/lib/lib*.so.*.*.* $RPM_BUILD_ROOT%{_libdir}
 cp -a stage/lib/lib*.so $RPM_BUILD_ROOT%{_libdir}
 
 # workaround https://github.com/boostorg/boost/issues/594
-cp -p bin.v2/libs/fiber/%{boost_buildsubdir}/debug-symbols-on/inlining-on/link-static/threading-multi/visibility-hidden/libboost_fiber.a $RPM_BUILD_ROOT%{_libdir}
-cp -p bin.v2/libs/stacktrace/%{boost_buildsubdir}/debug-symbols-on/inlining-on/link-static/threading-multi/visibility-hidden/libboost_stacktrace*.a $RPM_BUILD_ROOT%{_libdir}
-cp -p bin.v2/libs/fiber/%{boost_buildsubdir}/debug-symbols-on/inlining-on/threading-multi/visibility-hidden/libboost_fiber.so.* $RPM_BUILD_ROOT%{_libdir}
-cp -p bin.v2/libs/stacktrace/%{boost_buildsubdir}/debug-symbols-on/inlining-on/threading-multi/visibility-hidden/libboost_stacktrace*.so.* $RPM_BUILD_ROOT%{_libdir}
+find bin.v2/libs '(' -name libboost_fiber.a -o -name 'libboost_stacktrace_*.a' -o -name 'libboost_fiber.so.*' -o -name 'libboost_stacktrace_*.so.*' ')' -exec cp -p {} $RPM_BUILD_ROOT%{_libdir} \;
 for lib in $RPM_BUILD_ROOT%{_libdir}/*{stacktrace,fiber}*.so.*; do
 	ln -sf $(basename $lib) $RPM_BUILD_ROOT%{_libdir}/$(basename $lib .%{version})
 done
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/boost.git/commitdiff/e9018ce0611f26c8f4b4de42381eecb3cfcfd52b



More information about the pld-cvs-commit mailing list