pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lldb-git: Drop merged upstream patch for six.py
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat Feb 4 01:32:23 2017 +0100
Changeset: a514c6393773f78a849303d87bef4284d9c9bba4
Modified Files:
lldb-git/distinfo
Removed Files:
lldb-git/patches/patch-CMakeLists.txt
lldb-git/patches/patch-cmake_modules_LLDBConfig.cmake
lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py
lldb-git/patches/patch-scripts_finishSwigWrapperClasses.py
lldb-git/patches/patch-scripts_utilsArgsParse.py
Log Message:
lldb-git: Drop merged upstream patch for six.py
D29405 Install six.py conditionally
https://reviews.llvm.org/D29405
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=a514c6393773f78a849303d87bef4284d9c9bba4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lldb-git/distinfo | 5 ---
lldb-git/patches/patch-CMakeLists.txt | 23 -----------
.../patches/patch-cmake_modules_LLDBConfig.cmake | 14 -------
.../patch-scripts_Python_finishSwigPythonLLDB.py | 15 --------
.../patch-scripts_finishSwigWrapperClasses.py | 44 ----------------------
lldb-git/patches/patch-scripts_utilsArgsParse.py | 19 ----------
6 files changed, 120 deletions(-)
diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index ceefbcfbda..88a5a0218c 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -12,12 +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) = 18b67230b3c3a00e0a96d55f6c2b1305d5004b75
-SHA1 (patch-cmake_modules_LLDBConfig.cmake) = f2f743a350afbaeeda30d87e08424def3ce70f0c
SHA1 (patch-include_lldb_Core_Debugger.h) = 136fc7a23b424adf286a0dced98cece5a423d9af
-SHA1 (patch-scripts_Python_finishSwigPythonLLDB.py) = 68e6a027b746ceb6829ac9805be0e31ab10976c1
-SHA1 (patch-scripts_finishSwigWrapperClasses.py) = 453489318a5855e7d750903ab4f877ffb34d9652
-SHA1 (patch-scripts_utilsArgsParse.py) = b9b7a6f17b6e927882ad0aaffcbf5c53c1179499
SHA1 (patch-source_Commands_CommandObjectPlatform.cpp) = a038fecd3ad31bd6a11095ad7f4ac5b92847c78b
SHA1 (patch-source_Core_Debugger.cpp) = affa76051734351b7f9cfa6542f918930949ee38
SHA1 (patch-source_Core_ModuleList.cpp) = 1dc5f5d9309646f5ca0119bbbd30e8d9c3146c4d
diff --git a/lldb-git/patches/patch-CMakeLists.txt b/lldb-git/patches/patch-CMakeLists.txt
deleted file mode 100644
index 455ea1d71b..0000000000
--- a/lldb-git/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-$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
diff --git a/lldb-git/patches/patch-cmake_modules_LLDBConfig.cmake b/lldb-git/patches/patch-cmake_modules_LLDBConfig.cmake
deleted file mode 100644
index 5068d8cf2e..0000000000
--- a/lldb-git/patches/patch-cmake_modules_LLDBConfig.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- cmake/modules/LLDBConfig.cmake.orig 2017-01-28 19:35:14.000000000 +0000
-+++ cmake/modules/LLDBConfig.cmake
-@@ -29,6 +29,9 @@ set(LLDB_DISABLE_CURSES ${LLDB_DEFAULT_D
- set(LLDB_RELOCATABLE_PYTHON 0 CACHE BOOL
- "Causes LLDB to use the PYTHONHOME environment variable to locate Python.")
-
-+set(LLDB_USE_SYSTEM_SIX 0 CACHE BOOL
-+ "Use six.py shipped with system and do not install a copy of it")
-+
- if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
- set(LLDB_EXPORT_ALL_SYMBOLS 0 CACHE BOOL
- "Causes lldb to export all symbols when building liblldb.")
diff --git a/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py b/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py
deleted file mode 100644
index 7f63f18d78..0000000000
--- a/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- scripts/Python/finishSwigPythonLLDB.py.orig 2016-12-14 14:10:24.000000000 +0000
-+++ scripts/Python/finishSwigPythonLLDB.py
-@@ -821,7 +821,9 @@ def main(vDictArgs):
- bOk, strMsg = create_symlinks(
- vDictArgs, strFrameworkPythonDir, strLldbLibDir)
-
-- if bOk:
-+ bUseSystemSix = "--useSystemSix" in vDictArgs
-+
-+ if not bUseSystemSix and bOk:
- bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir)
-
- if bOk:
diff --git a/lldb-git/patches/patch-scripts_finishSwigWrapperClasses.py b/lldb-git/patches/patch-scripts_finishSwigWrapperClasses.py
deleted file mode 100644
index ab19697cf4..0000000000
--- a/lldb-git/patches/patch-scripts_finishSwigWrapperClasses.py
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
---- scripts/finishSwigWrapperClasses.py.orig 2016-09-10 17:36:23.000000000 +0000
-+++ scripts/finishSwigWrapperClasses.py
-@@ -81,6 +81,7 @@ Args: -h (optional) Print
- created for a Windows build.\n\
- --argsFile= The args are read from a file instead of the\n\
- command line. Other command line args are ignored.\n\
-+ --useSystemSix Use system six.py version.\n\
- \n\
- Usage:\n\
- finishSwigWrapperClasses.py --srcRoot=ADirPath --targetDir=ADirPath\n\
-@@ -178,7 +179,8 @@ def validate_arguments(vArgv):
- "prefix=",
- "cmakeBuildConfiguration=",
- "lldbLibDir=",
-- "argsFile"]
-+ "argsFile",
-+ "useSystemSix"]
- dictArgReq = {"-h": "o", # o = optional, m = mandatory
- "-d": "o",
- "-m": "o",
-@@ -188,7 +190,8 @@ def validate_arguments(vArgv):
- "--prefix": "o",
- "--cmakeBuildConfiguration": "o",
- "--lldbLibDir": "o",
-- "--argsFile": "o"}
-+ "--argsFile": "o",
-+ "--useSystemSix": "o"}
-
- # Check for mandatory parameters
- nResult, dictArgs, strMsg = utilsArgsParse.parse(vArgv, strListArgs,
-@@ -376,9 +379,11 @@ def main(vArgv):
- (optional) "lib" by default.
- --argsFile= The args are read from a file instead of the
- command line. Other command line args are ignored.
-+ --useSystemSix Use system six.py version.
- Usage:
- finishSwigWrapperClasses.py --srcRoot=ADirPath --targetDir=ADirPath
- --cfgBldDir=ADirPath --prefix=ADirPath --lldbLibDir=ADirPath -m -d
-+ --useSystemSix
-
- Results: 0 Success
- -1 Error - invalid parameters passed.
diff --git a/lldb-git/patches/patch-scripts_utilsArgsParse.py b/lldb-git/patches/patch-scripts_utilsArgsParse.py
deleted file mode 100644
index f4728b3009..0000000000
--- a/lldb-git/patches/patch-scripts_utilsArgsParse.py
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- scripts/utilsArgsParse.py.orig 2016-09-10 17:36:23.000000000 +0000
-+++ scripts/utilsArgsParse.py
-@@ -113,12 +113,12 @@ def parse(vArgv, vstrListArgs, vListLong
- break
- if match == 0:
- for arg in vListLongArgs:
-- argg = "--" + arg[:arg.__len__() - 1]
-+ argg = "--" + arg.rstrip('=')
- if opt == argg:
- if "m" == vDictArgReq[opt]:
- countMandatoryOpts = countMandatoryOpts + 1
- dictArgs[opt] = val
-- if val.__len__() == 0:
-+ if arg[-1:] == '=' and val.__len__() == 0:
- bFoundNoInputValue = True
- break
-
Home |
Main Index |
Thread Index |
Old Index