diff --git a/meta-oe/recipes-support/tbb/files/0001-tcm-test-Do-not-hardcode-the-build-directory-as-RPATH.patch b/meta-oe/recipes-support/tbb/files/0001-tcm-test-Do-not-hardcode-the-build-directory-as-RPATH.patch new file mode 100644 index 0000000000..1a488dd027 --- /dev/null +++ b/meta-oe/recipes-support/tbb/files/0001-tcm-test-Do-not-hardcode-the-build-directory-as-RPATH.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 12 Nov 2026 00:00:00 -0800 +Subject: [PATCH] tcm/test: Do not hardcode the build directory as RPATH + +test_premature_exit is linked with -rpath pointing at the build output +directory so that it can dlopen libtcm from there. When the tests are +installed (e.g. as ptests) this leaks the build path into the binary, +and libtcm is found in the regular library path anyway. + +Upstream-Status: Inappropriate [OE ptest specific] +Signed-off-by: Khem Raj +--- +--- a/thread_composability_manager/test/CMakeLists.txt ++++ b/thread_composability_manager/test/CMakeLists.txt +@@ -158,9 +158,6 @@ + PRIVATE ${TCM_COMPILE_DEFINITIONS} + PRIVATE TCM_LIB_NAME="$" + ) +-if (UNIX) +- target_link_options(${TCM_TEST_PREMATURE_EXIT} PRIVATE -Wl,-rpath,${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-endif (UNIX) + target_include_directories(${TCM_TEST_PREMATURE_EXIT} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include) + target_link_libraries(${TCM_TEST_PREMATURE_EXIT} PRIVATE Threads::Threads ${CMAKE_DL_LIBS}) + add_test(NAME ${TCM_TEST_PREMATURE_EXIT} COMMAND ${TCM_TEST_PREMATURE_EXIT}) diff --git a/meta-oe/recipes-support/tbb/tbb_2023.1.0.bb b/meta-oe/recipes-support/tbb/tbb_2023.2.0.bb similarity index 94% rename from meta-oe/recipes-support/tbb/tbb_2023.1.0.bb rename to meta-oe/recipes-support/tbb/tbb_2023.2.0.bb index 08f6ddcfd2..7958fe956d 100644 --- a/meta-oe/recipes-support/tbb/tbb_2023.1.0.bb +++ b/meta-oe/recipes-support/tbb/tbb_2023.2.0.bb @@ -13,11 +13,12 @@ DEPENDS:append:class-target = " hwloc" PE = "1" BRANCH = "onetbb_2023" -SRCREV = "3046c8b0c29df995980003ea24f4d78c80ec0c8d" +SRCREV = "41158a44ab3fb7ac5df7f99ef82626c87607447f" SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ file://run-ptest \ file://0001-test-Skip-conformance_resumable_tasks-when-resumable.patch \ file://0002-test-malloc_overload-Only-use-glibc-malloc-extension.patch \ + file://0001-tcm-test-Do-not-hardcode-the-build-directory-as-RPATH.patch \ " LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}" @@ -79,12 +80,14 @@ do_install_ptest() { do_install_ptest:append:toolchain-gcc() { cp -rf ${B}/gnu* ${D}${PTEST_PATH} rm -rf ${D}${PTEST_PATH}/gnu*/libtbb* + rm -rf ${D}${PTEST_PATH}/gnu*/libtcm* rm -rf ${D}${PTEST_PATH}/gnu*/*.sh } do_install_ptest:append:toolchain-clang() { cp -rf ${B}/clang* ${D}${PTEST_PATH} rm -rf ${D}${PTEST_PATH}/clang*/libtbb* + rm -rf ${D}${PTEST_PATH}/clang*/libtcm* rm -rf ${D}${PTEST_PATH}/clang*/*.sh }