diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2019-12-02 17:06:08 +0300 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2019-12-02 17:06:08 +0300 |
commit | 18583eaa2c6fa769ce80605422fa10a60d353af7 (patch) | |
tree | 4b6730afc2006e86ae8b91c8c4cf52b313b5c188 /debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch | |
download | llvm-toolchain-8-debian.tar.gz |
Import llvm-toolchain-8 (1:8.0.1-4)debian/8.0.1-4debian
Diffstat (limited to 'debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch')
-rw-r--r-- | debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch b/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch new file mode 100644 index 0000000..3647e71 --- /dev/null +++ b/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch @@ -0,0 +1,31 @@ +From d0d969074f6e0f975ad53d21e7ce6c7b40cf2957 Mon Sep 17 00:00:00 2001 +From: Peter Wu <peter@lekensteyn.nl> +Date: Fri, 4 May 2018 15:43:06 +0200 +Subject: [PATCH] [llvm] cmake: resolve symlinks in LLVMConfig.cmake + +Ensure that symlinks such as /usr/lib/llvm-X.Y/cmake (pointing to +lib/cmake/llvm) are resolved. This ensures that LLVM_INSTALL_PREFIX +becomes /usr/lib/llvm-X.Y instead of /usr. + +Partially addresses PR37128 +--- + cmake/modules/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: llvm-toolchain-snapshot_8~svn342269/cmake/modules/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot_8~svn342269.orig/cmake/modules/CMakeLists.txt ++++ llvm-toolchain-snapshot_8~svn342269/cmake/modules/CMakeLists.txt +@@ -82,10 +82,10 @@ file(COPY . + # Generate LLVMConfig.cmake for the install tree. + set(LLVM_CONFIG_CODE " + # Compute the installation prefix from this LLVMConfig.cmake file location. +-get_filename_component(LLVM_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") ++get_filename_component(LLVM_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" REALPATH)") + # Construct the proper number of get_filename_component(... PATH) + # calls to compute the installation prefix. +-string(REGEX REPLACE "/" ";" _count "${LLVM_INSTALL_PACKAGE_DIR}") ++string(REGEX REPLACE "/" ";" _count "prefix/${LLVM_INSTALL_PACKAGE_DIR}") + foreach(p ${_count}) + set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} + get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") |