pkgsrc-WIP-changes archive

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

lldb-git: Disable for now the patch for py-six conflict



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Apr 27 03:00:08 2016 +0200
Changeset:	10e5ec691b823285c0256daad56e5940cb1df706

Modified Files:
	lldb-git/distinfo
	lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py

Log Message:
lldb-git: Disable for now the patch for py-six conflict

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

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

diffstat:
 lldb-git/distinfo                                           |  2 +-
 .../patches/patch-scripts_Python_finishSwigPythonLLDB.py    | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 2b50501..bc34dec 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -20,7 +20,7 @@ SHA1 (patch-include_lldb_Utility_regex2.h) = 822a47b1221368ec5442bfbdbc20fe4e370
 SHA1 (patch-include_lldb_Utility_regex__impl.h) = 4d99669a756bd662ae28abc8cefe6e1538ef84b6
 SHA1 (patch-include_lldb_Utility_regutils.h) = ea36409f8cd05dcf9b81144cbc136abc5fc3a190
 SHA1 (patch-scripts_CMakeLists.txt) = 07043853b1a923aa8fcb9124b79453eca21c01fb
-SHA1 (patch-scripts_Python_finishSwigPythonLLDB.py) = e2ad536cf12cea251b2a2117091b970e3081fad6
+SHA1 (patch-scripts_Python_finishSwigPythonLLDB.py) = 7ae3c77322192f3ca2e0479044b286b0976abff4
 SHA1 (patch-source_Utility_CMakeLists.txt) = 5b10fe94d76135d8d5ba31862066841394dd45c1
 SHA1 (patch-source_Utility_regcomp.c) = bd315000773bab38b6fe6d119420afbcb5b83a59
 SHA1 (patch-source_Utility_regerror.c) = 6bbf8dc3f12e64515d166a475452f3f08d849ad3
diff --git a/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py b/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py
index 2c7a5a2..29c3a21 100644
--- a/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py
+++ b/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py
@@ -2,16 +2,3 @@ $NetBSD$
 
 Don't conflict with lang/py-six.
 
---- scripts/Python/finishSwigPythonLLDB.py.orig	2016-02-21 02:08:07.000000000 +0000
-+++ scripts/Python/finishSwigPythonLLDB.py
-@@ -719,8 +719,8 @@ def main(vDictArgs):
-     if bOk:
-         bOk, strMsg = create_symlinks(vDictArgs, strFrameworkPythonDir)
- 
--    if bOk:
--        bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir)
-+    # if bOk:
-+    #     bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir)
- 
-     if bOk:
-         bOk, strMsg = copy_lldbpy_file_to_lldb_pkg_dir(vDictArgs,


Home | Main Index | Thread Index | Old Index