Torsten Keßler pushed to branch main at Arch Linux / Packaging / Packages / intel-oneapi-tbb
Commits: 1bea1099 by Torsten Keßler at 2024-11-20T22:41:56+01:00 upgpkg: 2021.12.0-2 Remove linker configuration to mitigate issues with open source oneTBB. Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/intel-oneapi-tbb/-/issues/2 - - - - - 2 changed files: - .SRCINFO - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = intel-oneapi-tbb pkgdesc = Intel oneAPI Threading Building Blocks pkgver = 2021.12.0 - pkgrel = 1 + pkgrel = 2 url = https://software.intel.com/content/www/us/en/develop/tools/oneapi.html arch = x86_64 license = Apache-2.0 AND LicenseRef-Intel-EULA-Developer-Tools AND LicenseRef-Intel-Simplified ===================================== PKGBUILD ===================================== @@ -5,7 +5,7 @@ pkgname=intel-oneapi-tbb _pkgver=2021.12 pkgver=2021.12.0 _debpkgrel=495 -pkgrel=1 +pkgrel=2 pkgdesc="Intel oneAPI Threading Building Blocks" arch=('x86_64') url='https://software.intel.com/content/www/us/en/develop/tools/oneapi.html' @@ -63,9 +63,16 @@ package() { ln -s "${_prefix}"/latest/lib/cmake/tbb/TBBConfigVersion.cmake "${pkgdir}"/usr/share/cmake/TBB/TBBConfigVersion.cmake # ldconfig - install -d "${pkgdir}"/etc/ld.so.conf.d - echo "${_prefix}"/latest/"$(sed -n 's/libdir=${prefix}\///p' "${pkgdir}/${_prefix}/${_pkgver}"/lib/pkgconfig/tbb.pc)" \ - > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf" + # The binary version of oneTBB may lack behind the open source release + # that we package too. As long as there is no soname change in the open + # source release, we can safely rely on the libraries installed to /usr/lib. + # Only in case the sonames are not compatable, we have to revisit this issue + # and see how we can fix the oneAPI stack. The open source oneTBB package + # will always have priority. + # FIXME Find a better way to handle this. + # install -d "${pkgdir}"/etc/ld.so.conf.d + # echo "${_prefix}"/latest/"$(sed -n 's/libdir=${prefix}\///p' "${pkgdir}/${_prefix}/${_pkgver}"/lib/pkgconfig/tbb.pc)" \ + # > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf" install -d "${pkgdir}"/usr/share/licenses/"${pkgname}" ln -s /usr/share/licenses/intel-oneapi "${pkgdir}"/usr/share/licenses/"${pkgname}"/oneapi View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/intel-oneapi-tbb/-/commit/1bea1099bb7355ba51267d02f132aa25ba33a9e2 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/intel-oneapi-tbb/-/commit/1bea1099bb7355ba51267d02f132aa25ba33a9e2 You're receiving this email because of your account on gitlab.archlinux.org.
