commit fd261cb09446b2c81d710d157e9e7c18c7e53d6d · pyrox.dev/nixpkgs

+22

pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch

···

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

     

       2
       2
       +
       From: Tristan Ross <tristan.ross@midstall.com>

     

       3
       3
       +
       Date: Sat, 24 Aug 2024 19:56:24 -0700

     

       4
       4
       +
       Subject: [PATCH] [libclc] use default paths with find_program when possible

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        libclc/CMakeLists.txt | 4 ++--

     

       8
       8
       +
        1 file changed, 1 insertions(+), 1 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       11
       11
       +
       index 02bb859ae8590b..6bcd8ae52a5794 100644

     

       12
       12
       +
       --- a/CMakeLists.txt

     

       13
       13
       +
       +++ b/CMakeLists.txt

     

       14
       14
       +
       @@ -55,7 +55,7 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI

     

       15
       15
       +
          # Import required tools

     

       16
       16
       +
          if( NOT EXISTS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} )

     

       17
       17
       +
            foreach( tool IN ITEMS clang llvm-as llvm-link opt )

     

       18
       18
       +
       -      find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )

     

       19
       19
       +
       +      find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} )

     

       20
       20
       +
              set( ${tool}_exe ${LLVM_TOOL_${tool}} )

     

       21
       21
       +
              set( ${tool}_target )

     

       22
       22
       +
            endforeach()

+8

pkgs/development/compilers/llvm/21/libclc/gnu-install-dirs.patch

···

       1
       1
       +
       --- a/libclc.pc.in

     

       2
       2
       +
       +++ b/libclc.pc.in

     

       3
       3
       +
       @@ -1,4 +1,4 @@

     

       4
       4
       +
       -libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc

     

       5
       5
       +
       +libexecdir=@CMAKE_INSTALL_FULL_DATADIR@/clc

     

       6
       6
       +
        

     

       7
       7
       +
        Name: libclc

     

       8
       8
       +
        Description: Library requirements of the OpenCL C programming language

+1 -1

pkgs/development/compilers/llvm/common/default.nix

···

       484
       484
        
           }

     

       485
       485
        
           //

     

       486
       486
        
             lib.optionalAttrs

     

       487
       487
       -
               (lib.versionAtLeast metadata.release_version "16" && lib.versionOlder metadata.release_version "20")

     

       487
       487
       +
               (lib.versionAtLeast metadata.release_version "16" && lib.versionOlder metadata.release_version "22")

     

       488
       488
        
               {

     

       489
       489
        
                 libclc = callPackage ./libclc { };

     

       490
       490
        
               }

+1 -1

pkgs/development/compilers/llvm/common/libclc/default.nix

···

       50
       50
        
         ];

     

       51
       51
        
       

     

       52
       52
        
         patches = [

     

       53
       53
       -
           ./libclc-gnu-install-dirs.patch

     

       53
       53
       +
           (getVersionFile "libclc/gnu-install-dirs.patch")

     

       54
       54
        
         ]

     

       55
       55
        
         # LLVM 19 changes how host tools are looked up.

     

       56
       56
        
         # Need to remove NO_DEFAULT_PATH and the PATHS arguments for find_program

pkgs/development/compilers/llvm/common/libclc/libclc-gnu-install-dirs.patch pkgs/development/compilers/llvm/16/libclc/gnu-install-dirs.patch

+16

pkgs/development/compilers/llvm/common/patches.nix

···

       236
       236
        
         "libclc/use-default-paths.patch" = [

     

       237
       237
        
           {

     

       238
       238
        
             after = "19";

     

       239
       239
       +
             before = "20";

     

       239
       240
        
             path = ../19;

     

       241
       241
       +
           }

     

       242
       242
       +
           {

     

       243
       243
       +
             after = "20";

     

       244
       244
       +
             path = ../20;

     

       245
       245
       +
           }

     

       246
       246
       +
         ];

     

       247
       247
       +
         "libclc/gnu-install-dirs.patch" = [

     

       248
       248
       +
           {

     

       249
       249
       +
             after = "16";

     

       250
       250
       +
             before = "21";

     

       251
       251
       +
             path = ../16;

     

       252
       252
       +
           }

     

       253
       253
       +
           {

     

       254
       254
       +
             after = "21";

     

       255
       255
       +
             path = ../21;

     

       240
       256
        
           }

     

       241
       257
        
         ];

     

       242
       258
        
       }