proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 09:50:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the cmake paths in llvm-3.9-dev deb package. Thanks to Brad King

Browse Source 
for the patch (Closes: #819072)
This commit is contained in:
Sylvestre Ledru 2016-07-25 10:19:03 +00:00
parent b895313ad8
commit 89787810c3
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
llvm-toolchain-3.9 (1:3.9~svn275918-1~exp2) experimental; urgency=medium
* Fix the cmake paths in llvm-3.9-dev deb package. Thanks to Brad King
for the patch (Closes: #819072)
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 25 Jul 2016 12:18:52 +0200
llvm-toolchain-3.9 (1:3.9~svn275918-1~exp1) experimental; urgency=medium
* New snapshot release

25
debian/patches/fix-cmake-config-prefix.diff vendored
View File

@ -1,25 +1,6 @@
--- a/cmake/modules/Makefile
+++ b/cmake/modules/Makefile
@@ -62,17 +62,9 @@
LLVM_CONFIG_CODE := \
\# Compute the CMake directory from the LLVMConfig.cmake file location.\n\
-get_filename_component(_LLVM_CMAKE_DIR "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n\
-\# Compute the installation prefix from the LLVMConfig.cmake file location.\n\
-get_filename_component(LLVM_INSTALL_PREFIX "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n
+get_filename_component(_LLVM_CMAKE_DIR "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n
-# Compute number of levels (typically 3 - ``share/llvm/cmake/``) to PROJ_prefix
-# from PROJ_cmake, then emit the appropriate number of calls to
-# get_filename_components(). Note this assumes there are no spaces in the
-# cmake_path_suffix variable.
-cmake_path_suffix := $(subst $(PROJ_prefix),,$(subst $(DESTDIR),,$(PROJ_cmake)))
-cmake_path_dirs := $(subst /, ,$(cmake_path_suffix))
-LLVM_CONFIG_CODE += $(foreach __not_used,$(cmake_path_dirs),get_filename_component(LLVM_INSTALL_PREFIX "$${LLVM_INSTALL_PREFIX}" PATH)\n)
+LLVM_CONFIG_CODE += set(LLVM_INSTALL_PREFIX "$(subst /,\/,$(PROJ_prefix))")\n
LLVM_CONFIG_CODE += set(_LLVM_LIBRARY_DIR "$${LLVM_INSTALL_PREFIX}\/lib")
## Description: add some description
## Origin/Author: add some origin or author
## Bug: bug URL
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -47,16 +47,7 @@ file(COPY .