Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Fri Feb 3 22:23:41 2017 +0100
Changeset: 02293042db99203a4491ace64429d957a610ae0e
Modified Files:
lldb-git/Makefile
lldb-git/PLIST
lldb-git/distinfo
lldb-git/patches/patch-CMakeLists.txt
Log Message:
lldb-git: Include missing patch for CMakeLists.txt
From upstream:
https://reviews.llvm.org/file/data/zuij2g7uacqlgorqzsxo/PHID-FILE-7xncyhqd5ri6pjza2he2/D29405.diff
Sponsored by <The NetBSD Foundation>
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=02293042db99203a4491ace64429d957a610ae0e
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lldb-git/Makefile | 2 ++
lldb-git/PLIST | 1 -
lldb-git/distinfo | 2 +-
lldb-git/patches/patch-CMakeLists.txt | 23 +++++++++++++++++++++++
4 files changed, 26 insertions(+), 2 deletions(-)
diffs:
diff --git a/lldb-git/Makefile b/lldb-git/Makefile
index 37054b55a8..39acf08191 100644
--- a/lldb-git/Makefile
+++ b/lldb-git/Makefile
@@ -51,6 +51,8 @@ REPLACE_PYTHON+= scripts/shush
TEST_TARGET= check-lldb
TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib
+MAKE_FLAGS+= VERBOSE=1
+
post-extract:
${RUN} mkdir -p ${WRKDIR}/build
diff --git a/lldb-git/PLIST b/lldb-git/PLIST
index 3f31c40fd9..2ba35054ef 100644
--- a/lldb-git/PLIST
+++ b/lldb-git/PLIST
@@ -594,4 +594,3 @@ ${PYSITELIB}/lldb/lldb-argdumper
${PYSITELIB}/lldb/runtime/__init__.py
${PYSITELIB}/lldb/utils/__init__.py
${PYSITELIB}/lldb/utils/symbolication.py
-${PYSITELIB}/six.py
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index b39f91a259..903d12aae9 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-CMakeLists.txt) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-CMakeLists.txt) = 18b67230b3c3a00e0a96d55f6c2b1305d5004b75
SHA1 (patch-cmake_modules_LLDBConfig.cmake) = f2f743a350afbaeeda30d87e08424def3ce70f0c
SHA1 (patch-scripts_Python_finishSwigPythonLLDB.py) = 68e6a027b746ceb6829ac9805be0e31ab10976c1
SHA1 (patch-scripts_finishSwigWrapperClasses.py) = 453489318a5855e7d750903ab4f877ffb34d9652
diff --git a/lldb-git/patches/patch-CMakeLists.txt b/lldb-git/patches/patch-CMakeLists.txt
index e69de29bb2..455ea1d71b 100644
--- a/lldb-git/patches/patch-CMakeLists.txt
+++ b/lldb-git/patches/patch-CMakeLists.txt
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig 2017-01-28 19:35:14.000000000 +0000
++++ CMakeLists.txt
+@@ -20,6 +20,10 @@ endif()
+ # add_subdirectory(include)
+ add_subdirectory(docs)
+ if (NOT LLDB_DISABLE_PYTHON)
++ if(LLDB_USE_SYSTEM_SIX)
++ set(SIX_EXTRA_ARGS "--useSystemSix")
++ endif()
++
+ set(LLDB_PYTHON_TARGET_DIR ${LLDB_BINARY_DIR}/scripts)
+ if(LLDB_BUILD_FRAMEWORK)
+ set(LLDB_PYTHON_TARGET_DIR
+@@ -50,6 +54,7 @@ if (NOT LLDB_DISABLE_PYTHON)
+ --prefix=${CMAKE_BINARY_DIR}
+ --cmakeBuildConfiguration=${CMAKE_CFG_INTDIR}
+ --lldbLibDir=lib${LLVM_LIBDIR_SUFFIX}
++ ${SIX_EXTRA_ARGS}
+ ${FINISH_EXTRA_ARGS}
+ VERBATIM
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/finishSwigWrapperClasses.py