pkgsrc-WIP-changes archive

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

lldb-git: Improve patch for Python detection



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun May 1 13:45:07 2016 +0200
Changeset:	4422f65da65075ee4c52472c161623b2b307e6b9

Modified Files:
	lldb-git/distinfo
	lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
Removed Files:
	lldb-git/patches/patch-scripts_CMakeLists.txt

Log Message:
lldb-git: Improve patch for Python detection

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

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

diffstat:
 lldb-git/distinfo                                         |  3 +--
 lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake |  6 ++++--
 lldb-git/patches/patch-scripts_CMakeLists.txt             | 13 -------------
 3 files changed, 5 insertions(+), 17 deletions(-)

diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 1b52604..1d570e9 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -12,14 +12,13 @@ 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-cmake_modules_LLDBStandalone.cmake) = 73c166ac5a1ea43e601919d1b42744f568adfb4a
+SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = dda67c4816abbb2fcd6cf6737ab5f33ce82e0a9b
 SHA1 (patch-include_lldb_Utility_regcclass.h) = 9ed649e8deb5924feaf82a6e675f5c596367b3d6
 SHA1 (patch-include_lldb_Utility_regcname.h) = b67145f0437d3c09adc33a925d49267cd9ba4fd7
 SHA1 (patch-include_lldb_Utility_regengine.inc) = a031c43a63acab80a97cfb7727326d610d4ad9ab
 SHA1 (patch-include_lldb_Utility_regex2.h) = 822a47b1221368ec5442bfbdbc20fe4e370c1a6b
 SHA1 (patch-include_lldb_Utility_regex__impl.h) = 4d99669a756bd662ae28abc8cefe6e1538ef84b6
 SHA1 (patch-include_lldb_Utility_regutils.h) = ea36409f8cd05dcf9b81144cbc136abc5fc3a190
-SHA1 (patch-scripts_CMakeLists.txt) = 1f9515a9c615aab15ac6955894664e2187a5da88
 SHA1 (patch-source_Plugins_SymbolFile_PDB_CMakeLists.txt) = 3465152684eabea85f4ae6250db7bf01fe06cf90
 SHA1 (patch-source_Utility_CMakeLists.txt) = 5b10fe94d76135d8d5ba31862066841394dd45c1
 SHA1 (patch-source_Utility_regcomp.c) = bd315000773bab38b6fe6d119420afbcb5b83a59
diff --git a/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake b/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
index 1af9270..0e797cb 100644
--- a/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
+++ b/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- cmake/modules/LLDBStandalone.cmake.orig	2016-02-05 23:28:46.000000000 +0000
+--- cmake/modules/LLDBStandalone.cmake.orig	2016-05-01 10:39:36.000000000 +0000
 +++ cmake/modules/LLDBStandalone.cmake
 @@ -6,57 +6,78 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
  
@@ -122,9 +122,11 @@ $NetBSD$
  
    include(AddLLVM)
    include(HandleLLVMOptions)
-@@ -73,23 +94,16 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
+@@ -72,24 +93,18 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
+   else()
      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")
diff --git a/lldb-git/patches/patch-scripts_CMakeLists.txt b/lldb-git/patches/patch-scripts_CMakeLists.txt
deleted file mode 100644
index fd3acf6..0000000
--- a/lldb-git/patches/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- scripts/CMakeLists.txt.orig	2016-05-01 10:39:36.000000000 +0000
-+++ scripts/CMakeLists.txt
-@@ -9,6 +9,8 @@ set(SWIG_HEADERS
-   ${LLDB_SOURCE_DIR}/include/lldb/lldb-versioning.h
- )
- 
-+include(FindPythonInterp)
-+
- find_package(SWIG REQUIRED)
- add_custom_command(
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp


Home | Main Index | Thread Index | Old Index