pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lldb-git: Fix previous patch
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat Feb 6 02:38:44 2016 +0100
Changeset: 181d0504cce7b12afbd1da36ecafa38f809dee07
Modified Files:
lldb-git/distinfo
lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake
Log Message:
lldb-git: Fix previous patch
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=181d0504cce7b12afbd1da36ecafa38f809dee07
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lldb-git/distinfo | 2 +-
lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index da43e30..7068b1e 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -12,7 +12,7 @@ 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-lldb_cmake_modules_LLDBStandalone.cmake) = 843343c57a1c7887158022e1554760b9e8a35661
+SHA1 (patch-lldb_cmake_modules_LLDBStandalone.cmake) = 4a193da949e7e782471a16c4f1aa3fde2434669c
SHA1 (patch-lldb_include_lldb_Utility_regcclass.h) = c50fe5382aab03ab6b8bd4db165069c66e84bbb3
SHA1 (patch-lldb_include_lldb_Utility_regcname.h) = d51af35e60c484736c743045d17215168be68b21
SHA1 (patch-lldb_include_lldb_Utility_regengine.inc) = 8c317afaa5bcd8ea4c95afc09544f28160f8903b
diff --git a/lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake b/lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake
index 04620e7..31a2556 100644
--- a/lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake
+++ b/lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake
@@ -122,20 +122,19 @@ $NetBSD$
include(AddLLVM)
include(HandleLLVMOptions)
-@@ -73,9 +94,9 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
+@@ -73,23 +94,16 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
message("-- Found PythonInterp: ${PYTHON_EXECUTABLE}")
endif()
# Import CMake library targets from LLVM and Clang.
- include("${LLDB_PATH_TO_LLVM_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake")
- if (EXISTS "${LLDB_PATH_TO_CLANG_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
- include("${LLDB_PATH_TO_CLANG_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
+- endif()
+ include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake")
-+ if (EXISTS "${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/cmake/ClangConfig.cmake")
-+ include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
- endif()
++ include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
-@@ -83,13 +104,8 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
+
set(LLVM_BINARY_DIR ${CMAKE_BINARY_DIR})
set(CMAKE_INCLUDE_CURRENT_DIR ON)
Home |
Main Index |
Thread Index |
Old Index