Wed Sep 23 06:58:46 2020 UTC ()
lldb: better patch and small pylint fixes


(adam)
diff -r1.29 -r1.30 pkgsrc/devel/lldb/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/lldb/buildlink3.mk
diff -r1.23 -r1.24 pkgsrc/devel/lldb/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
cvs diff -r1.29 -r1.30 pkgsrc/devel/lldb/Makefile (switch to unified diff)

--- pkgsrc/devel/lldb/Makefile 2020/09/19 17:25:01 1.29
+++ pkgsrc/devel/lldb/Makefile 2020/09/23 06:58:46 1.30
@@ -1,94 +1,94 @@ @@ -1,94 +1,94 @@
1# $NetBSD: Makefile,v 1.29 2020/09/19 17:25:01 he Exp $ 1# $NetBSD: Makefile,v 1.30 2020/09/23 06:58:46 adam Exp $
2 2
3.include "../../lang/llvm/version.mk" 3.include "../../lang/llvm/version.mk"
4 4
5DISTNAME= lldb-${LLVM_VERSION}.src 5DISTNAME= lldb-${LLVM_VERSION}.src
6PKGNAME= ${DISTNAME:S/.src//} 6PKGNAME= ${DISTNAME:S/.src//}
7PKGREVISION= 1 7PKGREVISION= 1
8CATEGORIES= lang devel 8CATEGORIES= devel lang
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://lldb.org/ 11HOMEPAGE= http://lldb.org/
12COMMENT= Next generation, high-performance debugger 12COMMENT= Next generation, high-performance debugger
13LICENSE= apache-2.0 13LICENSE= apache-2.0
14 14
15DEPENDS+= llvm-${PKGVERSION_NOREV}{,nb*}:../../lang/llvm 15DEPENDS+= llvm-${PKGVERSION_NOREV}{,nb*}:../../lang/llvm
16DEPENDS+= clang-${PKGVERSION_NOREV}{,nb*}:../../lang/clang 16DEPENDS+= clang-${PKGVERSION_NOREV}{,nb*}:../../lang/clang
17DEPENDS+= swig3>=3.0:../../devel/swig3 17DEPENDS+= swig3>=3.0:../../devel/swig3
18DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 18DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
19 19
20CONFIGURE_DIRS= ${WRKDIR}/build 20CONFIGURE_DIRS= ${WRKDIR}/build
21CMAKE_ARG_PATH= ${WRKSRC} 21CMAKE_ARG_PATH= ${WRKSRC}
22 22
23USE_CMAKE= yes 23USE_CMAKE= yes
24USE_LANGUAGES= c c++14 24USE_LANGUAGES= c c++14
25GCC_REQD+= 4.8 25GCC_REQD+= 4.8
26PY_PATCHPLIST= yes 26PY_PATCHPLIST= yes
27 27
28CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH} 28CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
29CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 29CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
30CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q} 30CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
31CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q} 31CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
32CMAKE_ARGS+= -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON 32CMAKE_ARGS+= -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON
33CMAKE_ARGS+= -DLLDB_CODESIGN_IDENTITY="" 33CMAKE_ARGS+= -DLLDB_CODESIGN_IDENTITY=""
34CMAKE_ARGS+= -DLLDB_USE_SYSTEM_SIX:BOOL=TRUE 34CMAKE_ARGS+= -DLLDB_USE_SYSTEM_SIX:BOOL=TRUE
35 35
36CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm 36CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
37 37
38LUA_VERSIONS_ACCEPTED= 53 38LUA_VERSIONS_ACCEPTED= 53
39 39
40REPLACE_PERL+= *.pl 40REPLACE_PERL+= *.pl
41REPLACE_PERL+= */*.pl 41REPLACE_PERL+= */*.pl
42REPLACE_PERL+= */*/*.pl 42REPLACE_PERL+= */*/*.pl
43REPLACE_PERL+= */*/*/*.pl 43REPLACE_PERL+= */*/*/*.pl
44REPLACE_PERL+= */*/*/*/*.pl 44REPLACE_PERL+= */*/*/*/*.pl
45REPLACE_PERL+= */*/*/*/*/*.pl 45REPLACE_PERL+= */*/*/*/*/*.pl
46REPLACE_PERL+= scripts/sed-sources 46REPLACE_PERL+= scripts/sed-sources
47 47
48REPLACE_PYTHON+= *.py 48REPLACE_PYTHON+= *.py
49REPLACE_PYTHON+= */*.py 49REPLACE_PYTHON+= */*.py
50REPLACE_PYTHON+= */*/*.py 50REPLACE_PYTHON+= */*/*.py
51REPLACE_PYTHON+= */*/*/*.py 51REPLACE_PYTHON+= */*/*/*.py
52REPLACE_PYTHON+= */*/*/*/*.py 52REPLACE_PYTHON+= */*/*/*/*.py
53REPLACE_PYTHON+= */*/*/*/*/*.py 53REPLACE_PYTHON+= */*/*/*/*/*.py
54REPLACE_PYTHON+= */*/*/*/*/*/*.py 54REPLACE_PYTHON+= */*/*/*/*/*/*.py
55REPLACE_PYTHON+= */*/*/*/*/*/*/*.py 55REPLACE_PYTHON+= */*/*/*/*/*/*/*.py
56REPLACE_PYTHON+= scripts/shush 56REPLACE_PYTHON+= scripts/shush
57 57
58TEST_TARGET= check-lldb 58TEST_TARGET= check-lldb
59#TEST_TARGET= check-lldb-unit # doesn't work in standalone build 59#TEST_TARGET= check-lldb-unit # doesn't work in standalone build
60#TEST_TARGET= check-lldb-single # check-lldb -j1 60#TEST_TARGET= check-lldb-single # check-lldb -j1
61#TEST_TARGET= check-lldb-expr # unknown 61#TEST_TARGET= check-lldb-expr # unknown
62TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib 62TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib
63 63
64.include "../../mk/bsd.prefs.mk" 64.include "../../mk/bsd.prefs.mk"
65 65
66PLIST_VARS+= posix 66PLIST_VARS+= posix
67.if ${OPSYS} != "Darwin" 67.if ${OPSYS} != "Darwin"
68PLIST.posix= yes 68PLIST.posix= yes
69.endif 69.endif
70 70
71.if ${OPSYS} == "NetBSD" 71.if ${OPSYS} == "NetBSD"
72. if exists(/usr/include/panel.h) 72. if exists(/usr/include/panel.h)
73CMAKE_ARGS+= -DLLDB_DISABLE_CURSES:BOOL=FALSE 73CMAKE_ARGS+= -DLLDB_DISABLE_CURSES:BOOL=FALSE
74. else 74. else
75CMAKE_ARGS+= -DLLDB_DISABLE_CURSES:BOOL=TRUE 75CMAKE_ARGS+= -DLLDB_DISABLE_CURSES:BOOL=TRUE
76. endif 76. endif
77.endif 77.endif
78 78
79post-extract: 79post-extract:
80 ${MKDIR} ${WRKDIR}/build 80 ${MKDIR} ${WRKDIR}/build
81 81
82#.include "../../devel/googletest/buildlink3.mk" # check-lldb-unit 82#.include "../../devel/googletest/buildlink3.mk" # check-lldb-unit
83.include "../../devel/libatomic_ops/buildlink3.mk" 83.include "../../devel/libatomic_ops/buildlink3.mk"
84.include "../../devel/zlib/buildlink3.mk" 84.include "../../devel/zlib/buildlink3.mk"
85.include "../../lang/clang/buildlink3.mk" 85.include "../../lang/clang/buildlink3.mk"
86.include "../../lang/llvm/buildlink3.mk" 86.include "../../lang/llvm/buildlink3.mk"
87.include "../../lang/lua/buildlink3.mk" 87.include "../../lang/lua/buildlink3.mk"
88.include "../../lang/python/application.mk" 88.include "../../lang/python/application.mk"
89.include "../../lang/python/extension.mk" 89.include "../../lang/python/extension.mk"
90.include "../../lang/python/tool.mk" 90.include "../../lang/python/tool.mk"
91.include "../../textproc/libxml2/buildlink3.mk" 91.include "../../textproc/libxml2/buildlink3.mk"
92.include "../../mk/curses.buildlink3.mk" 92.include "../../mk/curses.buildlink3.mk"
93.include "../../mk/readline.buildlink3.mk" 93.include "../../mk/readline.buildlink3.mk"
94.include "../../mk/bsd.pkg.mk" 94.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/devel/lldb/buildlink3.mk (switch to unified diff)

--- pkgsrc/devel/lldb/buildlink3.mk 2020/06/02 08:22:40 1.8
+++ pkgsrc/devel/lldb/buildlink3.mk 2020/09/23 06:58:46 1.9
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.8 2020/06/02 08:22:40 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.9 2020/09/23 06:58:46 adam Exp $
2 2
3BUILDLINK_TREE+= lldb 3BUILDLINK_TREE+= lldb
4 4
5.if !defined(LLDB_BUILDLINK3_MK) 5.if !defined(LLDB_BUILDLINK3_MK)
6LLDB_BUILDLINK3_MK:= 6LLDB_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lldb+= lldb>=9.0.1 8BUILDLINK_API_DEPENDS.lldb+= lldb>=9.0.1
9BUILDLINK_ABI_DEPENDS.lldb?= lldb>=10.0.0nb1 9BUILDLINK_ABI_DEPENDS.lldb+= lldb>=10.0.0nb1
10BUILDLINK_PKGSRCDIR.lldb?= ../../devel/lldb 10BUILDLINK_PKGSRCDIR.lldb?= ../../devel/lldb
11 11
12.include "../../devel/zlib/buildlink3.mk" 12.include "../../devel/zlib/buildlink3.mk"
13.include "../../lang/clang/buildlink3.mk" 13.include "../../lang/clang/buildlink3.mk"
14.include "../../lang/llvm/buildlink3.mk" 14.include "../../lang/llvm/buildlink3.mk"
15.include "../../textproc/libxml2/buildlink3.mk" 15.include "../../textproc/libxml2/buildlink3.mk"
16.endif # LLDB_BUILDLINK3_MK 16.endif # LLDB_BUILDLINK3_MK
17 17
18BUILDLINK_TREE+= -lldb 18BUILDLINK_TREE+= -lldb
cvs diff -r1.23 -r1.24 pkgsrc/devel/lldb/distinfo (switch to unified diff)

--- pkgsrc/devel/lldb/distinfo 2020/09/23 06:01:00 1.23
+++ pkgsrc/devel/lldb/distinfo 2020/09/23 06:58:46 1.24
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.23 2020/09/23 06:01:00 mef Exp $ 1$NetBSD: distinfo,v 1.24 2020/09/23 06:58:46 adam Exp $
2 2
3SHA1 (lldb-10.0.1.src.tar.xz) = 90b946ff7b850bcded598509a10d0795e7da3f63 3SHA1 (lldb-10.0.1.src.tar.xz) = 90b946ff7b850bcded598509a10d0795e7da3f63
4RMD160 (lldb-10.0.1.src.tar.xz) = 59442a4685c7c6c2468477ce16fa09e4fef8540d 4RMD160 (lldb-10.0.1.src.tar.xz) = 59442a4685c7c6c2468477ce16fa09e4fef8540d
5SHA512 (lldb-10.0.1.src.tar.xz) = d7155cd6a7e2244cbf1f6114d790fdf2e667fd6285e2fc3a08a8f49c8e08f32827d7fa83d741ea0b54b788bd13c0c7498cf312a2cd3e86e049606869341b482e 5SHA512 (lldb-10.0.1.src.tar.xz) = d7155cd6a7e2244cbf1f6114d790fdf2e667fd6285e2fc3a08a8f49c8e08f32827d7fa83d741ea0b54b788bd13c0c7498cf312a2cd3e86e049606869341b482e
6Size (lldb-10.0.1.src.tar.xz) = 9632124 bytes 6Size (lldb-10.0.1.src.tar.xz) = 9632124 bytes
7SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 55a8d614cc52872968fc7c7c205c7d6e4021b538 7SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 55a8d614cc52872968fc7c7c205c7d6e4021b538
8SHA1 (patch-source_API_CMakeLists.txt) = ed630498cdd30f6f11c5fbfa8d9f539baeba5a2c 8SHA1 (patch-source_API_CMakeLists.txt) = ed630498cdd30f6f11c5fbfa8d9f539baeba5a2c
9SHA1 (patch-source_Host_CMakeLists.txt) = 5c7ae7b896aa110fe7ab21ed3616350e0958bc2a 9SHA1 (patch-source_Host_CMakeLists.txt) = 5c7ae7b896aa110fe7ab21ed3616350e0958bc2a
10SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = e3044c199a9382960c666ad42ca69b90828b686b 10SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = e3044c199a9382960c666ad42ca69b90828b686b
11SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = d114f912b9c2ee24f5aadc40441049b8f76974b3 11SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = 1a01bed99b146a7c3e8bcdc559dc2755f997ac4c
cvs diff -r1.2 -r1.3 pkgsrc/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h (switch to unified diff)

--- pkgsrc/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h 2020/09/23 06:01:01 1.2
+++ pkgsrc/devel/lldb/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h 2020/09/23 06:58:46 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h,v 1.2 2020/09/23 06:01:01 mef Exp $ 1$NetBSD: patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h,v 1.3 2020/09/23 06:58:46 adam Exp $
2 2
3Declare StopProcess. 3Declare StopProcess.
4 4
5--- work/lldb-10.0.1.src/source/Plugins/Process/NetBSD/NativeProcessNetBSD.h.orig 2020-07-07 16:21:37.000000000 +0000 5--- source/Plugins/Process/NetBSD/NativeProcessNetBSD.h.orig 2020-07-07 16:21:37.000000000 +0000
6+++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.h 6+++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.h
7@@ -86,6 +86,7 @@ public: 7@@ -86,6 +86,7 @@ public:
8 // Interface used by NativeRegisterContext-derived classes. 8 // Interface used by NativeRegisterContext-derived classes.
9 static Status PtraceWrapper(int req, lldb::pid_t pid, void *addr = nullptr, 9 static Status PtraceWrapper(int req, lldb::pid_t pid, void *addr = nullptr,
10 int data = 0, int *result = nullptr); 10 int data = 0, int *result = nullptr);
11+ static Status StopProcess(lldb::pid_t pid); 11+ static Status StopProcess(lldb::pid_t pid);
12  12
13 private: 13 private:
14 MainLoop::SignalHandleUP m_sigchld_handle; 14 MainLoop::SignalHandleUP m_sigchld_handle;