From 73a44bbacc51370429b1a9f6c3ba44db3255c60dbe8c4de536c05fc639d510de Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 9 Apr 2022 16:16:03 +0000 Subject: [PATCH] Accepting request 967152 from home:badshah400:branches:devel:libraries:c_c++ For 32-bit systems, rename tbb32.pc (default upstream for 32-bit) to tbb.pc (same as 64-bit) so that applications depending on tbb do not have to call different pkgconfig modules based on arch. OBS-URL: https://build.opensuse.org/request/show/967152 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tbb?expand=0&rev=71 --- tbb.changes | 8 ++++++++ tbb.spec | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tbb.changes b/tbb.changes index 11b31f1..1ed1f5e 100644 --- a/tbb.changes +++ b/tbb.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Apr 5 14:34:05 UTC 2022 - Atri Bhattacharya + +- For 32-bit systems, rename tbb32.pc (default upstream for + 32-bit) to tbb.pc (same as 64-bit) so that applications + depending on tbb do not have to call different pkgconfig modules + based on arch. + ------------------------------------------------------------------- Fri Oct 8 08:11:54 UTC 2021 - Ben Greiner diff --git a/tbb.spec b/tbb.spec index 19bb185..ad985a0 100644 --- a/tbb.spec +++ b/tbb.spec @@ -223,6 +223,10 @@ popd # we install it into the devel package docdir rm -r %{buildroot}%{_datadir}/doc/TBB +# Rename tbb32.pc to tbb.pc (same as 64-bit) so that applications depending on tbb +# do not have to call different pkgconfig modules based on arch +test -f %{buildroot}%{_libdir}/pkgconfig/tbb32.pc && mv %{buildroot}%{_libdir}/pkgconfig/tbb32.pc %{buildroot}%{_libdir}/pkgconfig/tbb.pc + %check %if %{with test} %ctest --exclude-regex python_test @@ -262,7 +266,7 @@ popd %{_includedir}/tbb/ %{_includedir}/oneapi/ %{_libdir}/cmake/TBB -%{_libdir}/pkgconfig/tbb*.pc +%{_libdir}/pkgconfig/tbb.pc %{_libdir}/libtbb.so %{_libdir}/libtbbmalloc.so %{_libdir}/libtbbmalloc_proxy.so