Commit a95f58cc authored by Tristan Ross's avatar Tristan Ross Committed by Alyssa Ross
Browse files

llvmPackages_19: 19.1.0-rc3 -> 19.1.0

parent 6710d0dd

pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ index 3aca22c0b..3115353e3 100644 
                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})

   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})

   install(FILES lib/libscanbuild/${lib}

-          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild

-          DESTINATION lib/libscanbuild

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"

           COMPONENT scan-build-py)

 endforeach()
@@ -55,7 +55,7 @@ index 3aca22c0b..3115353e3 100644 
                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})

   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})

   install(FILES lib/libscanbuild/resources/${resource}

-          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources

-          DESTINATION lib/libscanbuild/resources

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources"

           COMPONENT scan-build-py)

 endforeach()
@@ -64,7 +64,7 @@ index 3aca22c0b..3115353e3 100644 
                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})

   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})

   install(FILES lib/libear/${lib}

-          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear

-          DESTINATION lib/libear

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"

           COMPONENT scan-build-py)

 endforeach()

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

+0 −5
Original line number Diff line number Diff line
@@ -88,13 +88,8 @@ let 
                }

                {

                  after = "19";

                  before = "20";

                  path = ../19;

                }

                {

                  after = "20";

                  path = ../git;

                }

              ];

              "clang/purity.patch" = [

                {

pkgs/development/compilers/llvm/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ let 
    "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs=";

    "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";

    "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";

    "19.1.0-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs=";

    "19.1.0".officialRelease.sha256 = "sha256-/Ano8LwpGmW3C1ovJyvY3WIfliVkQi130f70WazwzGc=";

    "20.0.0-git".gitRelease = {

      rev = "81c3499531c3fe03827bd8bc890e3a16db9e4c3c";

      rev-version = "20.0.0-unstable-2024-09-22";

pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake

index 75b0080f6..c895b884c 100644

--- a/cmake/modules/AddClang.cmake

+++ b/cmake/modules/AddClang.cmake

@@ -119,8 +119,8 @@ macro(add_clang_library name)

         install(TARGETS ${lib}

           COMPONENT ${lib}

           ${export_to_clangtargets}

-          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

-          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

+          LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"

+          ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"

           RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

 

         if (NOT LLVM_ENABLE_IDE)

diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt

index e6ae4e19e..5ef01aea2 100644

--- a/lib/Headers/CMakeLists.txt

+++ b/lib/Headers/CMakeLists.txt

@@ -337,6 +337,7 @@ set(llvm_libc_wrapper_files

 

 include(GetClangResourceDir)

 get_clang_resource_dir(output_dir PREFIX ${LLVM_LIBRARY_OUTPUT_INTDIR}/.. SUBDIR include)

+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include)

 set(out_files)

 set(generated_files)

 

diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt

index b5b6d2807..6b592d255 100644

--- a/tools/libclang/CMakeLists.txt

+++ b/tools/libclang/CMakeLists.txt

@@ -246,7 +246,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS})

           COMPONENT

             libclang-python-bindings

           DESTINATION

-            "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")

+            "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")

 endforeach()

 if(NOT LLVM_ENABLE_IDE)

   add_custom_target(libclang-python-bindings)

diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt

index 3aca22c0b..3115353e3 100644

--- a/tools/scan-build-py/CMakeLists.txt

+++ b/tools/scan-build-py/CMakeLists.txt

@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild})

                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})

   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})

   install(FILES lib/libscanbuild/${lib}

-          DESTINATION lib/libscanbuild

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"

           COMPONENT scan-build-py)

 endforeach()

 

@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources})

                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})

   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})

   install(FILES lib/libscanbuild/resources/${resource}

-          DESTINATION lib/libscanbuild/resources

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources"

           COMPONENT scan-build-py)

 endforeach()

 

@@ -122,7 +122,7 @@ foreach(lib ${LibEar})

                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})

   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})

   install(FILES lib/libear/${lib}

-          DESTINATION lib/libear

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"

           COMPONENT scan-build-py)

 endforeach()

pkgs/top-level/aliases.nix

+2 −2
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ mapAliases { 
  libbpf_1 = libbpf; # Added 2022-12-06

  libbson = mongoc; # Added 2024-03-11

  libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10

  libclc = llvmPackages_latest.libclc; # Added 2023-10-28

  libclc = llvmPackages_18.libclc; # Added 2023-10-28

  libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08

  libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23

  libgme = game-music-emu; # Added 2022-07-20
@@ -1752,7 +1752,7 @@ mapAliases { 
  openbsdCross = openbsd; # Added 2024-09-06



  # LLVM packages for (integration) testing that should not be used inside Nixpkgs:

  llvmPackages_latest = llvmPackages_18;

  llvmPackages_latest = llvmPackages_19;



  /* If these are in the scope of all-packages.nix, they cause collisions

    between mixed versions of qt. See: