pkgsrc-WIP-changes archive

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

lldb: apply build from linux.



Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Wed May 10 17:52:38 2023 +0200
Changeset:	74f9f294dc35b0557161b5c6b60c49b34c5eaad2

Modified Files:
	lldb/Makefile
	lldb/PLIST
	lldb/PLIST.Linux
	lldb/options.mk

Log Message:
lldb: apply build from linux.

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

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

diffstat:
 lldb/Makefile    | 10 ++--------
 lldb/PLIST       | 14 +++++++++-----
 lldb/PLIST.Linux |  2 +-
 lldb/options.mk  | 35 ++++++++++++++++++++++++++++++++++-
 4 files changed, 46 insertions(+), 15 deletions(-)

diffs:
diff --git a/lldb/Makefile b/lldb/Makefile
index 766583f374..77757ddf41 100644
--- a/lldb/Makefile
+++ b/lldb/Makefile
@@ -56,15 +56,11 @@ TEST_ENV+=		LD_LIBRARY_PATH=${WRKDIR}/build/lib
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
-.  if exists(/usr/include/panel.h)
-CMAKE_ARGS+=	LLDB_ENABLE_CURSES=1
-.  else
-CMAKE_ARGS+=	LLDB_ENABLE_CURSES=0
-.  endif
+PLIST_SUBST+=	LLVM_MAJOR_VERSION=${LLVM_MAJOR_VERSION}
 
 .include "options.mk"
 
+.if ${OPSYS} == "NetBSD"
 .  if ${OPSYS_VERSION} < 99922
 # lacks ptrace(2) PT_STOP
 PKG_FAIL_REASON+=	"Only NetBSD >= 9.99.22 provides ptrace(2) PT_STOP"
@@ -87,6 +83,4 @@ post-extract:
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/tool.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lldb/PLIST b/lldb/PLIST
index 7c7083ee4e..8c52bf9661 100644
--- a/lldb/PLIST
+++ b/lldb/PLIST
@@ -61,6 +61,7 @@ include/lldb/API/SBThread.h
 include/lldb/API/SBThreadCollection.h
 include/lldb/API/SBThreadPlan.h
 include/lldb/API/SBTrace.h
+include/lldb/API/SBTraceCursor.h
 include/lldb/API/SBType.h
 include/lldb/API/SBTypeCategory.h
 include/lldb/API/SBTypeEnumMember.h
@@ -143,6 +144,7 @@ include/lldb/Core/StructuredDataImpl.h
 include/lldb/Core/ThreadSafeDenseMap.h
 include/lldb/Core/ThreadSafeDenseSet.h
 include/lldb/Core/ThreadSafeValue.h
+include/lldb/Core/ThreadedCommunication.h
 include/lldb/Core/UniqueCStringMap.h
 include/lldb/Core/UserSettingsController.h
 include/lldb/Core/Value.h
@@ -259,11 +261,11 @@ include/lldb/Host/netbsd/HostInfoNetBSD.h
 include/lldb/Host/openbsd/HostInfoOpenBSD.h
 include/lldb/Host/posix/ConnectionFileDescriptorPosix.h
 include/lldb/Host/posix/DomainSocket.h
-include/lldb/Host/posix/Fcntl.h
 include/lldb/Host/posix/HostInfoPosix.h
 include/lldb/Host/posix/HostProcessPosix.h
 include/lldb/Host/posix/HostThreadPosix.h
 include/lldb/Host/posix/LockFilePosix.h
+include/lldb/Host/posix/MainLoopPosix.h
 include/lldb/Host/posix/PipePosix.h
 include/lldb/Host/posix/ProcessLauncherPosixFork.h
 include/lldb/Host/windows/AutoHandle.h
@@ -272,6 +274,7 @@ include/lldb/Host/windows/HostInfoWindows.h
 include/lldb/Host/windows/HostProcessWindows.h
 include/lldb/Host/windows/HostThreadWindows.h
 include/lldb/Host/windows/LockFileWindows.h
+include/lldb/Host/windows/MainLoopWindows.h
 include/lldb/Host/windows/PipeWindows.h
 include/lldb/Host/windows/PosixApi.h
 include/lldb/Host/windows/ProcessLauncherWindows.h
@@ -329,6 +332,8 @@ include/lldb/Interpreter/Options.h
 include/lldb/Interpreter/Property.h
 include/lldb/Interpreter/ScriptInterpreter.h
 include/lldb/Interpreter/ScriptedInterface.h
+include/lldb/Interpreter/ScriptedMetadata.h
+include/lldb/Interpreter/ScriptedPlatformInterface.h
 include/lldb/Interpreter/ScriptedProcessInterface.h
 include/lldb/Symbol/ArmUnwindInfo.h
 include/lldb/Symbol/Block.h
@@ -458,6 +463,7 @@ include/lldb/Utility/DataBufferHeap.h
 include/lldb/Utility/DataBufferLLVM.h
 include/lldb/Utility/DataEncoder.h
 include/lldb/Utility/DataExtractor.h
+include/lldb/Utility/Diagnostics.h
 include/lldb/Utility/Endian.h
 include/lldb/Utility/Environment.h
 include/lldb/Utility/Event.h
@@ -478,8 +484,6 @@ include/lldb/Utility/ProcessInfo.h
 include/lldb/Utility/RangeMap.h
 include/lldb/Utility/RegisterValue.h
 include/lldb/Utility/RegularExpression.h
-include/lldb/Utility/Reproducer.h
-include/lldb/Utility/ReproducerProvider.h
 include/lldb/Utility/Scalar.h
 include/lldb/Utility/SelectHelper.h
 include/lldb/Utility/SharedCluster.h
@@ -510,7 +514,6 @@ include/lldb/Version/Version.h
 include/lldb/lldb-defines.h
 include/lldb/lldb-enumerations.h
 include/lldb/lldb-forward.h
-include/lldb/lldb-private-defines.h
 include/lldb/lldb-private-enumerations.h
 include/lldb/lldb-private-forward.h
 include/lldb/lldb-private-interfaces.h
@@ -521,7 +524,7 @@ include/lldb/lldb-types.h
 include/lldb/lldb-versioning.h
 lib/liblldb.so
 lib/liblldb.so.${PKGVERSION}
-lib/liblldb.so.15
+lib/liblldb.so.${LLVM_MAJOR_VERSION}
 lib/lua/5.3/lldb.so
 ${PYSITELIB}/lldb/__init__.py
 ${PYSITELIB}/lldb/_lldb.so
@@ -537,6 +540,7 @@ ${PYSITELIB}/lldb/formatters/metrics.py
 ${PYSITELIB}/lldb/formatters/synth.py
 ${PYSITELIB}/lldb/lldb-argdumper
 ${PYSITELIB}/lldb/plugins/__init__.py
+${PYSITELIB}/lldb/plugins/scripted_platform.py
 ${PYSITELIB}/lldb/plugins/scripted_process.py
 ${PYSITELIB}/lldb/utils/__init__.py
 ${PYSITELIB}/lldb/utils/in_call_stack.py
diff --git a/lldb/PLIST.Linux b/lldb/PLIST.Linux
index 3f27997bde..594a4c1e2d 100644
--- a/lldb/PLIST.Linux
+++ b/lldb/PLIST.Linux
@@ -1,3 +1,3 @@
 @comment $NetBSD: PLIST.Linux,v 1.1 2021/05/15 08:22:06 nia Exp $
 lib/liblldbIntelFeatures.so
-lib/liblldbIntelFeatures.so.10
+lib/liblldbIntelFeatures.so.${LLVM_MAJOR_VERSION}
diff --git a/lldb/options.mk b/lldb/options.mk
index 198bee358d..850f690c19 100644
--- a/lldb/options.mk
+++ b/lldb/options.mk
@@ -2,7 +2,8 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lldb
 
-PKG_SUPPORTED_OPTIONS+=	tests
+PKG_SUPPORTED_OPTIONS+=	tests curses
+PKG_SUGGESTED_OPTIONS=	curses
 
 .include "../../mk/bsd.options.mk"
 
@@ -12,3 +13,35 @@ CMAKE_ARGS+=	-DLLVM_INCLUDE_TESTS=ON
 # py-lit, py-psutil, lld
 CMAKE_ARGS+=	-DLLVM_INCLUDE_TESTS=OFF
 .endif
+
+.if ${PKG_OPTIONS:Mcurses}
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
+
+.  if ${OPSYS} == "NetBSD"
+.    if exists(/usr/include/panel.h)
+CMAKE_ARGS+=	LLDB_ENABLE_CURSES=1
+.    else
+.include "../../devel/ncurses/buildlink3.mk"
+.      if exists(${BUILDLINK_PREFIX.ncurses}/include/panel.h)
+CMAKE_ARGS+=    LLDB_ENABLE_CURSES=1
+.      else
+CMAKE_ARGS+=    LLDB_ENABLE_CURSES=0
+.      endif
+.    endif
+CMAKE_ARGS+=	LLDB_ENABLE_CURSES=0
+.  endif
+
+.  if ${OPSYS} != "NetBSD"
+.include "../../devel/ncurses/buildlink3.mk"
+.    if exists(${BUILDLINK_PREFIX.ncurses}/include/panel.h)
+CMAKE_ARGS+=    LLDB_ENABLE_CURSES=1
+.    else
+CMAKE_ARGS+=    LLDB_ENABLE_CURSES=0
+.    endif
+.  endif
+
+.else
+
+CMAKE_ARGS+=	LLDB_ENABLE_CURSES=0
+.endif


Home | Main Index | Thread Index | Old Index