proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-12 16:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Install cmake files in usr/share/llvm-@LLVM_VERSION@/cmake/ instead of

Browse Source 
usr/share/llvm-@LLVM_VERSION@/cmake/
* Also install libLLVM-3.8.so.1 as a symlink
* debian/patches/fix-cmake-config-prefix.diff:
  cover the CMake build system too
(Closes: #819072)
This commit is contained in:
Sylvestre Ledru 2016-05-09 05:32:59 +00:00
parent 60980f0137
commit bd33ffeced
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
llvm-toolchain-3.8 (1:3.8.1-2) unstable; urgency=medium
[ Brad King ]
* Install cmake files in usr/share/llvm-@LLVM_VERSION@/cmake/ instead of
usr/share/llvm-@LLVM_VERSION@/cmake/
* Also install libLLVM-3.8.so.1 as a symlink
* debian/patches/fix-cmake-config-prefix.diff:
cover the CMake build system too
(Closes: #819072)
--
llvm-toolchain-3.8 (1:3.8.1-1) UNRELEASED; urgency=medium
* Preparation of 3.8.1

3
debian/llvm-X.Y-dev.install.in vendored
View File

@ -9,8 +9,7 @@ usr/lib/llvm-@LLVM_VERSION@/lib/BugpointPasses.so
usr/lib/llvm-@LLVM_VERSION@/include/llvm/ usr/include/llvm-@LLVM_VERSION@/
usr/lib/llvm-@LLVM_VERSION@/include/llvm-c/ usr/include/llvm-c-@LLVM_VERSION@/
# Explicit debian/tmp since there are multiple declarations
debian/tmp/usr/lib/llvm-@LLVM_VERSION@/share/llvm/cmake/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/
debian/tmp/usr/lib/llvm-@LLVM_VERSION@/share/llvm/cmake/*.cmake
utils/vim/indent/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/indent/

1
debian/llvm-X.Y-dev.links.in vendored
View File

@ -1,4 +1,5 @@
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so.1
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1

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

@ -23,3 +23,24 @@
LLVM_CONFIG_CODE += set(_LLVM_LIBRARY_DIR "$${LLVM_INSTALL_PREFIX}\/lib")
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -47,16 +47,7 @@ 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)")
-# Construct the proper number of get_filename_component(... PATH)
-# calls to compute the installation prefix.
-string(REGEX REPLACE "/" ";" _count "${LLVM_INSTALL_PACKAGE_DIR}")
-foreach(p ${_count})
- set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE}
-get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)")
-endforeach(p)
+set(LLVM_CONFIG_CODE "set(LLVM_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")")
set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include")
set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}")
set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}")