Rename patch

This commit is contained in:
Gianfranco Costamagna 2015-08-20 15:50:58 +00:00
parent 69ca163006
commit 92a41b7e99
3 changed files with 24 additions and 1 deletions

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium
* Team upload
[ Luciano Bello ]
* d/p/CVE-2015-2305.patch, fix security issue on regcomp.c

View File

@ -0,0 +1,22 @@
--- 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")

View File

@ -42,4 +42,4 @@ clang-analyzer-force-version.diff
locale-issue-ld.diff
CVE-2015-2305.patch
bug783205.patch
fix-cmake-config-prefix.patch
fix-cmake-config-prefix.diff