Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2023-03-31 10:09:57 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2023-03-31 10:09:57 +0200
commit25a265aa7ac11662ba824662fa2f3fa8cf2cd505 (patch)
tree14d6d48ddfcc3c05e8229ecde76b0a8cc44e77ab
parentb81a381d9119f7549ad428eb8d1c8d310147b136 (diff)
extra/onetbb: removed patch for waitpkg disabling (upstream issue 370)
-rw-r--r--extra/onetbb/PKGBUILD15
-rw-r--r--extra/onetbb/oneTBB-2021.5.0-no-waitpkg.patch12
2 files changed, 0 insertions, 27 deletions
diff --git a/extra/onetbb/PKGBUILD b/extra/onetbb/PKGBUILD
index ea8c3d64..c8838aef 100644
--- a/extra/onetbb/PKGBUILD
+++ b/extra/onetbb/PKGBUILD
@@ -1,18 +1,3 @@
-# disable waitpkg extensions (error is inline failing in _tpause)
-# (see https://github.com/oneapi-src/oneTBB/issues/370 and
-# https://github.com/oneapi-src/oneTBB/pull/609/commits/542a27fa1cfafaf76772e793549d9f4d288d03a9)
-source+=('oneTBB-2021.5.0-no-waitpkg.patch')
-sha512sums+=('918cb0418118de415eb9a7872a4938d15aec8b1ea096bc2996bc7390cd9c73cdc551f15a590b518ec1decfb458d8a488338625a81c26287cba184352fb950f16')
-eval "$(
- {
- declare -f prepare || \
- printf 'prepare() { cd ${srcdir}/oneTBB-${pkgver}\n}\n'
- } \
- | sed '
- $i patch -d "${srcdir}/oneTBB-${pkgver}" -p1 -i "$srcdir/oneTBB-2021.5.0-no-waitpkg.patch"
- '
-)"
-
# -latomic on i486
if [ "$CARCH" == 'i486' ]; then
eval "$(
diff --git a/extra/onetbb/oneTBB-2021.5.0-no-waitpkg.patch b/extra/onetbb/oneTBB-2021.5.0-no-waitpkg.patch
deleted file mode 100644
index ab65e99f..00000000
--- a/extra/onetbb/oneTBB-2021.5.0-no-waitpkg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rauN oneTBB-2021.5.0/cmake/compilers/GNU.cmake oneTBB-2021.5.0-no-waitpkg/cmake/compilers/GNU.cmake
---- oneTBB-2021.5.0/cmake/compilers/GNU.cmake 2021-12-17 14:40:54.000000000 +0100
-+++ oneTBB-2021.5.0-no-waitpkg/cmake/compilers/GNU.cmake 2022-06-29 07:45:39.996610962 +0200
-@@ -36,7 +36,7 @@
- endif()
-
- # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
--if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
-+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
- set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
- endif()
-