commit eab30996bd6a8ed2b74f49276146fab8c6d17597 · pyrox.dev/nixpkgs

+13 -8

pkgs/development/compilers/llvm/4/libc++/default.nix

···

       10
        
           export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"

     

       11
        
         '';

     

       12
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
         preConfigure = ''

     

       14
        
           # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package

     

       15
        
           cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")

     

       16
        
         '';

     

       17
        
       

     

       18
       -
         patchPhase = ''

     

       19
       -
           substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"

     

       20
       -
         '';

     

       21
        
       

     

       22
       -
         buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

     

       23
        
       

     

       24
        
         cmakeFlags = [

     

       25
       -
             "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"

     

       26
       -
             "-DLIBCXX_LIBCPPABI_VERSION=2"

     

       27
       -
             "-DLIBCXX_CXX_ABI=libcxxabi"

     

       28
       -
           ];

     

       29
        
       

     

       30
        
         enableParallelBuilding = true;

     

       31

···

       10
        
           export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"

     

       11
        
         '';

     

       12
        
       

     

       13
       +
         # https://github.com/llvm-mirror/libcxx/commit/bcc92d75df0274b9593ebd097fcae60494e3bffc

     

       14
       +
         patches = [ ./pthread_mach_thread_np.patch ];

     

       15
       +
       

     

       16
       +
         prePatch = ''

     

       17
       +
           substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"

     

       18
       +
         '';

     

       19
       +
       

     

       20
        
         preConfigure = ''

     

       21
        
           # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package

     

       22
        
           cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")

     

       23
        
         '';

     

       24
        
       

     

       25
       +
         nativeBuildInputs = [ cmake ];

     

       0
        
       
     

       0
        
       
     

       26
        
       

     

       27
       +
         buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

     

       28
        
       

     

       29
        
         cmakeFlags = [

     

       30
       +
           "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"

     

       31
       +
           "-DLIBCXX_LIBCPPABI_VERSION=2"

     

       32
       +
           "-DLIBCXX_CXX_ABI=libcxxabi"

     

       33
       +
         ];

     

       34
        
       

     

       35
        
         enableParallelBuilding = true;

     

       36

+41

pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch

···

       1
       +
       From bcc92d75df0274b9593ebd097fcae60494e3bffc Mon Sep 17 00:00:00 2001

     

       2
       +
       From: Asiri Rathnayake <asiri.rathnayake@arm.com>

     

       3
       +
       Date: Thu, 26 Jan 2017 10:40:17 +0000

     

       4
       +
       Subject: [PATCH] Fix chromium build (libcxx)

     

       5
       +
       

     

       6
       +
       Remove the reference to pthread_mach_thread_np() in libcxx headers.

     

       7
       +
       

     

       8
       +
       git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@293167 91177308-0d34-0410-b5e6-96231b3b80d8

     

       9
       +
       ---

     

       10
       +
        include/__threading_support | 11 -----------

     

       11
       +
        1 file changed, 11 deletions(-)

     

       12
       +
       

     

       13
       +
       diff --git a/include/__threading_support b/include/__threading_support

     

       14
       +
       index 13ab769..dfe7fe1 100644

     

       15
       +
       --- a/include/__threading_support

     

       16
       +
       +++ b/include/__threading_support

     

       17
       +
       @@ -149,11 +149,6 @@ int __libcpp_execute_once(__libcpp_exec_once_flag *flag,

     

       18
       +
                                  void (*init_routine)(void));

     

       19
       +
        

     

       20
       +
        // Thread id

     

       21
       +
       -#if defined(__APPLE__) && !defined(__arm__)

     

       22
       +
       -_LIBCPP_THREAD_ABI_VISIBILITY

     

       23
       +
       -mach_port_t __libcpp_thread_get_port();

     

       24
       +
       -#endif

     

       25
       +
       -

     

       26
       +
        _LIBCPP_THREAD_ABI_VISIBILITY

     

       27
       +
        bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2);

     

       28
       +
        

     

       29
       +
       @@ -297,12 +292,6 @@ int __libcpp_execute_once(__libcpp_exec_once_flag *flag,

     

       30
       +
        }

     

       31
       +
        

     

       32
       +
        // Thread id

     

       33
       +
       -#if defined(__APPLE__) && !defined(__arm__)

     

       34
       +
       -mach_port_t __libcpp_thread_get_port() {

     

       35
       +
       -    return pthread_mach_thread_np(pthread_self());

     

       36
       +
       -}

     

       37
       +
       -#endif

     

       38
       +
       -

     

       39
       +
        // Returns non-zero if the thread ids are equal, otherwise 0

     

       40
       +
        bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2)

     

       41
       +
        {