commit 09bb3d872b592d30da42548207928b80d3ba9486 · pyrox.dev/nixpkgs

+69

pkgs/by-name/tb/tbb_2022/fix-libtbbmalloc-dlopen.patch

···

       1
       1
       +
       From 791d42ddacad829d19a4f66b77dc9ca410008db9 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Emily <hello@emily.moe>

     

       3
       3
       +
       Date: Sat, 13 Sep 2025 03:16:16 +0100

     

       4
       4
       +
       Subject: [PATCH] Use `dladdr` to keep `libtbbmalloc` loaded on POSIX

     

       5
       5
       +
       

     

       6
       6
       +
       This fixes issues that arise when `libtbbmalloc` cannot be loaded by

     

       7
       7
       +
       relative path, makes the behaviour consistent with the Windows code

     

       8
       8
       +
       path, and eliminates the duplication of `MALLOCLIB_NAME`.

     

       9
       9
       +
       ---

     

       10
       10
       +
        src/tbbmalloc/tbbmalloc.cpp | 34 +++++++++-------------------------

     

       11
       11
       +
        1 file changed, 9 insertions(+), 25 deletions(-)

     

       12
       12
       +
       

     

       13
       13
       +
       diff --git a/src/tbbmalloc/tbbmalloc.cpp b/src/tbbmalloc/tbbmalloc.cpp

     

       14
       14
       +
       index b72e03a74f..12d62445aa 100644

     

       15
       15
       +
       --- a/src/tbbmalloc/tbbmalloc.cpp

     

       16
       16
       +
       +++ b/src/tbbmalloc/tbbmalloc.cpp

     

       17
       17
       +
       @@ -1,5 +1,5 @@

     

       18
       18
       +
        /*

     

       19
       19
       +
       -    Copyright (c) 2005-2023 Intel Corporation

     

       20
       20
       +
       +    Copyright (c) 2005-2025 Intel Corporation

     

       21
       21
       +
        

     

       22
       22
       +
            Licensed under the Apache License, Version 2.0 (the "License");

     

       23
       23
       +
            you may not use this file except in compliance with the License.

     

       24
       24
       +
       @@ -32,25 +32,6 @@

     

       25
       25
       +
        namespace rml {

     

       26
       26
       +
        namespace internal {

     

       27
       27
       +
        

     

       28
       28
       +
       -#if TBB_USE_DEBUG

     

       29
       29
       +
       -#define DEBUG_SUFFIX "_debug"

     

       30
       30
       +
       -#else

     

       31
       31
       +
       -#define DEBUG_SUFFIX

     

       32
       32
       +
       -#endif /* TBB_USE_DEBUG */

     

       33
       33
       +
       -

     

       34
       34
       +
       -// MALLOCLIB_NAME is the name of the oneTBB memory allocator library.

     

       35
       35
       +
       -#if _WIN32||_WIN64

     

       36
       36
       +
       -#define MALLOCLIB_NAME "tbbmalloc" DEBUG_SUFFIX ".dll"

     

       37
       37
       +
       -#elif __APPLE__

     

       38
       38
       +
       -#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".2.dylib"

     

       39
       39
       +
       -#elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__

     

       40
       40
       +
       -#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so"

     

       41
       41
       +
       -#elif __unix__

     

       42
       42
       +
       -#define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX  __TBB_STRING(.so.2)

     

       43
       43
       +
       -#else

     

       44
       44
       +
       -#error Unknown OS

     

       45
       45
       +
       -#endif

     

       46
       46
       +
       -

     

       47
       47
       +
        void init_tbbmalloc() {

     

       48
       48
       +
        #if __TBB_USE_ITT_NOTIFY

     

       49
       49
       +
            MallocInitializeITT();

     

       50
       50
       +
       @@ -92,11 +73,14 @@ struct RegisterProcessShutdownNotification {

     

       51
       51
       +
            RegisterProcessShutdownNotification() {

     

       52
       52
       +
                // prevents unloading, POSIX case

     

       53
       53
       +
        

     

       54
       54
       +
       -        // We need better support for the library pinning

     

       55
       55
       +
       -        // when dlopen can't find TBBmalloc library.

     

       56
       56
       +
       -        // for example: void *ret = dlopen(MALLOCLIB_NAME, RTLD_NOW);

     

       57
       57
       +
       -        // MALLOC_ASSERT(ret, "Allocator can't load itself.");

     

       58
       58
       +
       -        dlopen(MALLOCLIB_NAME, RTLD_NOW);

     

       59
       59
       +
       +        Dl_info dlinfo;

     

       60
       60
       +
       +        int ret = dladdr((void*)&init_tbbmalloc, &dlinfo);

     

       61
       61
       +
       +        MALLOC_ASSERT(ret && dlinfo.dli_fname, "Allocator can't find itself.");

     

       62
       62
       +
       +        tbb::detail::suppress_unused_warning(ret);

     

       63
       63
       +
       +

     

       64
       64
       +
       +        void* lib = dlopen(dlinfo.dli_fname, RTLD_NOW);

     

       65
       65
       +
       +        MALLOC_ASSERT(lib, "Allocator can't load itself.");

     

       66
       66
       +
       +        tbb::detail::suppress_unused_warning(lib);

     

       67
       67
       +
            }

     

       68
       68
       +
        

     

       69
       69
       +
            RegisterProcessShutdownNotification(RegisterProcessShutdownNotification&) = delete;

pkgs/by-name/tb/tbb_2022/package.nix

···

       29
       29
        
       

     

       30
       30
        
           # <https://github.com/uxlfoundation/oneTBB/pull/987>

     

       31
       31
        
           ./fix-32-bit-powerpc-build.patch

     

       32
       32
       +
       

     

       33
       33
       +
           # Fix an assumption that `libtbbmalloc` can pass a relative path to

     

       34
       34
       +
           # `dlopen(3)` to find itself. This caused mysterious crashes on

     

       35
       35
       +
           # macOS, where we do not use run paths by default.

     

       36
       36
       +
           #

     

       37
       37
       +
           # <https://github.com/uxlfoundation/oneTBB/pull/1849>

     

       38
       38
       +
           ./fix-libtbbmalloc-dlopen.patch

     

       32
       39
        
         ];

     

       33
       40
        
       

     

       34
       41
        
         nativeBuildInputs = [