pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libunwind-git: Fix cmake paths



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Feb 6 16:50:01 2016 +0100
Changeset:	f54c58e55450837aeb7f078306171562febf9b22

Modified Files:
	libunwind-git/distinfo
Added Files:
	libunwind-git/patches/patch-libunwind_CMakeLists.txt

Log Message:
libunwind-git: Fix cmake paths

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f54c58e55450837aeb7f078306171562febf9b22

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libunwind-git/distinfo                               |  1 +
 libunwind-git/patches/patch-libunwind_CMakeLists.txt | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diffs:
diff --git a/libunwind-git/distinfo b/libunwind-git/distinfo
index 7931384..8dc3e25 100644
--- a/libunwind-git/distinfo
+++ b/libunwind-git/distinfo
@@ -12,3 +12,4 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
 SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
 RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
 Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
+SHA1 (patch-libunwind_CMakeLists.txt) = 9b71c6a94c0a1cb791f7645a3f68a2b66cc3929b
diff --git a/libunwind-git/patches/patch-libunwind_CMakeLists.txt b/libunwind-git/patches/patch-libunwind_CMakeLists.txt
new file mode 100644
index 0000000..8e6e81f
--- /dev/null
+++ b/libunwind-git/patches/patch-libunwind_CMakeLists.txt
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- libunwind/CMakeLists.txt.orig	2016-01-21 13:29:48.000000000 +0000
++++ libunwind/CMakeLists.txt
+@@ -41,7 +41,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
+     set(LLVM_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
+     set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
+     set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
+-    set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
++    set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
+     set(LLVM_LIT_PATH "${LLVM_PATH}/utils/lit/lit.py")
+   else ()
+     message(FATAL_ERROR "llvm-config not found and LLVM_MAIN_SRC_DIR not defined. "
+@@ -221,4 +221,3 @@ append_if(LIBUNWIND_COMPILE_FLAGS LIBUNW
+ include_directories(include)
+ 
+ add_subdirectory(src)
+-


Home | Main Index | Thread Index | Old Index