diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2024-07-14 23:38:02 +0100 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2024-07-14 23:38:02 +0100 |
| commit | 52cd9426fc2dc5bd354e77b75bd29ad82c5b77d3 (patch) | |
| tree | b02e53ec3b6096afa6753fbe2b63f33af2f73e2b | |
| parent | dev-cpp/tbb: Version bump to 2021.13.0 (diff) | |
| download | gentoo-52cd9426fc2dc5bd354e77b75bd29ad82c5b77d3.tar.gz gentoo-52cd9426fc2dc5bd354e77b75bd29ad82c5b77d3.tar.bz2 gentoo-52cd9426fc2dc5bd354e77b75bd29ad82c5b77d3.zip | |
dev-cpp/tbb: Fix 2021.13.0 tests on non-x86 32-bit arches with patch
Thanks to John Paul Adrian Glaubitz for the patch. It has been submitted but not
yet accepted upstream.
Closes: https://bugs.gentoo.org/911759
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
| -rw-r--r-- | dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch | 38 | ||||
| -rw-r--r-- | dev-cpp/tbb/tbb-2021.13.0.ebuild | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch b/dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch new file mode 100644 index 000000000000..7cc8216153d0 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch @@ -0,0 +1,38 @@ +From c828ae47b8f4bea7736d2f9d05460e2b529c9d7d Mon Sep 17 00:00:00 2001 +From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> +Date: Fri, 9 Dec 2022 12:36:11 +0100 +Subject: [PATCH] Add cmake check for libatomic requirement when building with + gcc (#980) + +Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> +--- + cmake/compilers/GNU.cmake | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake +index cd76acfe1e..59f4e6934f 100644 +--- a/cmake/compilers/GNU.cmake ++++ b/cmake/compilers/GNU.cmake +@@ -44,6 +44,22 @@ if (NOT MINGW) + set(TBB_COMMON_LINK_LIBS dl) + endif() + ++# Check whether code with full atomics can be built without libatomic ++# see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358 ++include(CheckCXXSourceCompiles) ++check_cxx_source_compiles("#include <atomic> ++int main() { ++ std::atomic<uint8_t> w1; ++ std::atomic<uint16_t> w2; ++ std::atomic<uint32_t> w4; ++ std::atomic<uint64_t> w8; ++ return ++w1 + ++w2 + ++w4 + ++w8; ++}" TBB_BUILDS_WITHOUT_LIBATOMIC) ++ ++if(NOT TBB_BUILDS_WITHOUT_LIBATOMIC) ++ set(TBB_COMMON_LINK_LIBS ${TBB_COMMON_LINK_LIBS} atomic) ++endif() ++ + # Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled. + if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag) + tbb_remove_compile_flag(-Werror) diff --git a/dev-cpp/tbb/tbb-2021.13.0.ebuild b/dev-cpp/tbb/tbb-2021.13.0.ebuild index 3ac69c080835..ac958e5973a4 100644 --- a/dev-cpp/tbb/tbb-2021.13.0.ebuild +++ b/dev-cpp/tbb/tbb-2021.13.0.ebuild @@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch + "${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch ) src_prepare() { |