tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom
nixpkgs / pkgs / development / compilers / llvm / 5 / clang / gnu-install-dirs.patch
at netboot-syslinux-multiplatform 242 lines 9.8 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 2667b1d6892e..87c5ad58738f 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.4.3) 6 if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) 7 project(Clang) 8 9+ include(GNUInstallDirs) 10+ 11 # Rely on llvm-config. 12 set(CONFIG_OUTPUT) 13 find_program(LLVM_CONFIG "llvm-config") 14@@ -344,7 +346,7 @@ include_directories(BEFORE 15 16 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 17 install(DIRECTORY include/clang include/clang-c 18- DESTINATION include 19+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 20 FILES_MATCHING 21 PATTERN "*.def" 22 PATTERN "*.h" 23@@ -353,7 +355,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 24 ) 25 26 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang 27- DESTINATION include 28+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 29 FILES_MATCHING 30 PATTERN "CMakeFiles" EXCLUDE 31 PATTERN "*.inc" 32@@ -361,7 +363,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 33 ) 34 35 install(PROGRAMS utils/bash-autocomplete.sh 36- DESTINATION share/clang 37+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 38 ) 39 endif() 40 41diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake 42index e657059744a4..19da44638fe6 100644 43--- a/cmake/modules/AddClang.cmake 44+++ b/cmake/modules/AddClang.cmake 45@@ -99,9 +99,9 @@ macro(add_clang_library name) 46 install(TARGETS ${name} 47 COMPONENT ${name} 48 ${export_to_clangtargets} 49- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} 50- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} 51- RUNTIME DESTINATION bin) 52+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} 53+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} 54+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 55 56 if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) 57 add_custom_target(install-${name} 58@@ -143,7 +143,7 @@ macro(add_clang_tool name) 59 60 install(TARGETS ${name} 61 ${export_to_clangtargets} 62- RUNTIME DESTINATION bin 63+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} 64 COMPONENT ${name}) 65 66 if(NOT CMAKE_CONFIGURATION_TYPES) 67@@ -160,5 +160,5 @@ endmacro() 68 macro(add_clang_symlink name dest) 69 add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) 70 # Always generate install targets 71- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) 72+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) 73 endmacro() 74diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt 75index a621c02644e3..e140efc9c83c 100644 76--- a/lib/Headers/CMakeLists.txt 77+++ b/lib/Headers/CMakeLists.txt 78@@ -129,13 +129,13 @@ install( 79 FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h 80 COMPONENT clang-headers 81 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ 82- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) 83+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) 84 85 install( 86 FILES ${cuda_wrapper_files} 87 COMPONENT clang-headers 88 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ 89- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) 90+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) 91 92 if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. 93 add_custom_target(install-clang-headers 94diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt 95index ad990e010eef..92e52d05afb9 100644 96--- a/tools/c-index-test/CMakeLists.txt 97+++ b/tools/c-index-test/CMakeLists.txt 98@@ -48,7 +48,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 99 set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH 100 "@executable_path/../../lib") 101 else() 102- set(INSTALL_DESTINATION bin) 103+ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) 104 endif() 105 106 install(TARGETS c-index-test 107diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt 108index 04151a8e0331..13918d91c4ba 100644 109--- a/tools/clang-check/CMakeLists.txt 110+++ b/tools/clang-check/CMakeLists.txt 111@@ -19,4 +19,4 @@ target_link_libraries(clang-check 112 ) 113 114 install(TARGETS clang-check 115- RUNTIME DESTINATION bin) 116+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 117diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt 118index a13633eaefc4..9b0094783690 100644 119--- a/tools/clang-format/CMakeLists.txt 120+++ b/tools/clang-format/CMakeLists.txt 121@@ -20,20 +20,20 @@ if( LLVM_USE_SANITIZE_COVERAGE ) 122 endif() 123 124 install(PROGRAMS clang-format-bbedit.applescript 125- DESTINATION share/clang 126+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 127 COMPONENT clang-format) 128 install(PROGRAMS clang-format-diff.py 129- DESTINATION share/clang 130+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 131 COMPONENT clang-format) 132 install(PROGRAMS clang-format-sublime.py 133- DESTINATION share/clang 134+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 135 COMPONENT clang-format) 136 install(PROGRAMS clang-format.el 137- DESTINATION share/clang 138+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 139 COMPONENT clang-format) 140 install(PROGRAMS clang-format.py 141- DESTINATION share/clang 142+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 143 COMPONENT clang-format) 144 install(PROGRAMS git-clang-format 145- DESTINATION bin 146+ DESTINATION ${CMAKE_INSTALL_BINDIR} 147 COMPONENT clang-format) 148diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt 149index 6161d08ae587..a003292d1676 100644 150--- a/tools/clang-offload-bundler/CMakeLists.txt 151+++ b/tools/clang-offload-bundler/CMakeLists.txt 152@@ -21,4 +21,4 @@ target_link_libraries(clang-offload-bundler 153 ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} 154 ) 155 156-install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) 157+install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 158diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt 159index 771e3bdea6f0..d1396e62b28f 100644 160--- a/tools/clang-rename/CMakeLists.txt 161+++ b/tools/clang-rename/CMakeLists.txt 162@@ -14,11 +14,11 @@ target_link_libraries(clang-rename 163 clangToolingRefactor 164 ) 165 166-install(TARGETS clang-rename RUNTIME DESTINATION bin) 167+install(TARGETS clang-rename RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 168 169 install(PROGRAMS clang-rename.py 170- DESTINATION share/clang 171+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 172 COMPONENT clang-rename) 173 install(PROGRAMS clang-rename.el 174- DESTINATION share/clang 175+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang 176 COMPONENT clang-rename) 177diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt 178index 2dd670307636..1fe576f77ddb 100644 179--- a/tools/libclang/CMakeLists.txt 180+++ b/tools/libclang/CMakeLists.txt 181@@ -121,7 +121,7 @@ endif() 182 if(INTERNAL_INSTALL_PREFIX) 183 set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") 184 else() 185- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) 186+ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) 187 endif() 188 189 install(DIRECTORY ../../include/clang-c 190diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt 191index 380379300b09..adfd58ed5f7d 100644 192--- a/tools/scan-build/CMakeLists.txt 193+++ b/tools/scan-build/CMakeLists.txt 194@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) 195 ${CMAKE_BINARY_DIR}/bin/ 196 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) 197 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) 198- install(PROGRAMS bin/${BinFile} DESTINATION bin) 199+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) 200 endforeach() 201 202 foreach(LibexecFile ${LibexecFiles}) 203@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) 204 ${CMAKE_BINARY_DIR}/libexec/ 205 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) 206 list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) 207- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) 208+ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) 209 endforeach() 210 211 foreach(ManPage ${ManPages}) 212@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) 213 ${CMAKE_BINARY_DIR}/share/scan-build/ 214 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) 215 list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) 216- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) 217+ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) 218 endforeach() 219 220 add_custom_target(scan-build ALL DEPENDS ${Depends}) 221diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt 222index b305ca562a72..554bcb379061 100644 223--- a/tools/scan-view/CMakeLists.txt 224+++ b/tools/scan-view/CMakeLists.txt 225@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) 226 ${CMAKE_BINARY_DIR}/bin/ 227 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) 228 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) 229- install(PROGRAMS bin/${BinFile} DESTINATION bin) 230+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) 231 endforeach() 232 233 foreach(ShareFile ${ShareFiles}) 234@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) 235 ${CMAKE_BINARY_DIR}/share/scan-view/ 236 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) 237 list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) 238- install(FILES share/${ShareFile} DESTINATION share/scan-view) 239+ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) 240 endforeach() 241 242 add_custom_target(scan-view ALL DEPENDS ${Depends})