lldb: better patch and small pylint fixesdiff -r1.29 -r1.30 pkgsrc/devel/lldb/Makefile
(adam)
@@ -1,21 +1,21 @@ | @@ -1,21 +1,21 @@ | |||
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 | |||
5 | DISTNAME= lldb-${LLVM_VERSION}.src | 5 | DISTNAME= lldb-${LLVM_VERSION}.src | |
6 | PKGNAME= ${DISTNAME:S/.src//} | 6 | PKGNAME= ${DISTNAME:S/.src//} | |
7 | PKGREVISION= 1 | 7 | PKGREVISION= 1 | |
8 | CATEGORIES= lang devel | 8 | CATEGORIES= devel lang | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://lldb.org/ | 11 | HOMEPAGE= http://lldb.org/ | |
12 | COMMENT= Next generation, high-performance debugger | 12 | COMMENT= Next generation, high-performance debugger | |
13 | LICENSE= apache-2.0 | 13 | LICENSE= apache-2.0 | |
14 | 14 | |||
15 | DEPENDS+= llvm-${PKGVERSION_NOREV}{,nb*}:../../lang/llvm | 15 | DEPENDS+= llvm-${PKGVERSION_NOREV}{,nb*}:../../lang/llvm | |
16 | DEPENDS+= clang-${PKGVERSION_NOREV}{,nb*}:../../lang/clang | 16 | DEPENDS+= clang-${PKGVERSION_NOREV}{,nb*}:../../lang/clang | |
17 | DEPENDS+= swig3>=3.0:../../devel/swig3 | 17 | DEPENDS+= swig3>=3.0:../../devel/swig3 | |
18 | DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six | 18 | DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six | |
19 | 19 | |||
20 | CONFIGURE_DIRS= ${WRKDIR}/build | 20 | CONFIGURE_DIRS= ${WRKDIR}/build | |
21 | CMAKE_ARG_PATH= ${WRKSRC} | 21 | CMAKE_ARG_PATH= ${WRKSRC} |
@@ -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 | |||
3 | BUILDLINK_TREE+= lldb | 3 | BUILDLINK_TREE+= lldb | |
4 | 4 | |||
5 | .if !defined(LLDB_BUILDLINK3_MK) | 5 | .if !defined(LLDB_BUILDLINK3_MK) | |
6 | LLDB_BUILDLINK3_MK:= | 6 | LLDB_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.lldb+= lldb>=9.0.1 | 8 | BUILDLINK_API_DEPENDS.lldb+= lldb>=9.0.1 | |
9 | BUILDLINK_ABI_DEPENDS.lldb?= lldb>=10.0.0nb1 | 9 | BUILDLINK_ABI_DEPENDS.lldb+= lldb>=10.0.0nb1 | |
10 | BUILDLINK_PKGSRCDIR.lldb?= ../../devel/lldb | 10 | BUILDLINK_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 | |||
18 | BUILDLINK_TREE+= -lldb | 18 | BUILDLINK_TREE+= -lldb |
@@ -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 | |||
3 | SHA1 (lldb-10.0.1.src.tar.xz) = 90b946ff7b850bcded598509a10d0795e7da3f63 | 3 | SHA1 (lldb-10.0.1.src.tar.xz) = 90b946ff7b850bcded598509a10d0795e7da3f63 | |
4 | RMD160 (lldb-10.0.1.src.tar.xz) = 59442a4685c7c6c2468477ce16fa09e4fef8540d | 4 | RMD160 (lldb-10.0.1.src.tar.xz) = 59442a4685c7c6c2468477ce16fa09e4fef8540d | |
5 | SHA512 (lldb-10.0.1.src.tar.xz) = d7155cd6a7e2244cbf1f6114d790fdf2e667fd6285e2fc3a08a8f49c8e08f32827d7fa83d741ea0b54b788bd13c0c7498cf312a2cd3e86e049606869341b482e | 5 | SHA512 (lldb-10.0.1.src.tar.xz) = d7155cd6a7e2244cbf1f6114d790fdf2e667fd6285e2fc3a08a8f49c8e08f32827d7fa83d741ea0b54b788bd13c0c7498cf312a2cd3e86e049606869341b482e | |
6 | Size (lldb-10.0.1.src.tar.xz) = 9632124 bytes | 6 | Size (lldb-10.0.1.src.tar.xz) = 9632124 bytes | |
7 | SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 55a8d614cc52872968fc7c7c205c7d6e4021b538 | 7 | SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 55a8d614cc52872968fc7c7c205c7d6e4021b538 | |
8 | SHA1 (patch-source_API_CMakeLists.txt) = ed630498cdd30f6f11c5fbfa8d9f539baeba5a2c | 8 | SHA1 (patch-source_API_CMakeLists.txt) = ed630498cdd30f6f11c5fbfa8d9f539baeba5a2c | |
9 | SHA1 (patch-source_Host_CMakeLists.txt) = 5c7ae7b896aa110fe7ab21ed3616350e0958bc2a | 9 | SHA1 (patch-source_Host_CMakeLists.txt) = 5c7ae7b896aa110fe7ab21ed3616350e0958bc2a | |
10 | SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = e3044c199a9382960c666ad42ca69b90828b686b | 10 | SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = e3044c199a9382960c666ad42ca69b90828b686b | |
11 | SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = d114f912b9c2ee24f5aadc40441049b8f76974b3 | 11 | SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = 1a01bed99b146a7c3e8bcdc559dc2755f997ac4c |
@@ -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 | |||
3 | Declare StopProcess. | 3 | Declare 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; |