pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lldb-git: Use CONFIGURE_DIRS. Thanks Thomas Klausner!
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sun Nov 29 03:50:31 2015 +0100
Changeset: 17ba345e9d2278b7ae8ad1ec0b5687cd54962e69
Modified Files:
lldb-git/Makefile
lldb-git/distinfo
lldb-git/patches/patch-source-Initialization-SystemInitializerCommon.cpp
Log Message:
lldb-git: Use CONFIGURE_DIRS. Thanks Thomas Klausner!
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=17ba345e9d2278b7ae8ad1ec0b5687cd54962e69
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lldb-git/Makefile | 163 +++++++++++----------
lldb-git/distinfo | 2 +-
...urce-Initialization-SystemInitializerCommon.cpp | 4 +-
3 files changed, 85 insertions(+), 84 deletions(-)
diffs:
diff --git a/lldb-git/Makefile b/lldb-git/Makefile
index 0093ff4..a768014 100644
--- a/lldb-git/Makefile
+++ b/lldb-git/Makefile
@@ -11,7 +11,8 @@ HOMEPAGE= http://lldb.org/
COMMENT= next generation, high-performance debugger
LICENSE= modified-bsd
-WRKSRC= ${WRKDIR}/build
+WRKSRC= ${WRKDIR}
+CONFIGURE_DIRS= ${WRKDIR}/build
USE_LANGUAGES= c c++
USE_CMAKE+= yes
@@ -21,87 +22,87 @@ CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
PY_PATCHPLIST= yes
-REPLACE_PERL+= ${WRKDIR}/llvm/tools/lldb/packages/Python/lldbsuite/test/attic/dotest.pl
-REPLACE_PERL+= ${WRKDIR}/llvm/tools/lldb/scripts/build-llvm.pl
-REPLACE_PERL+= ${WRKDIR}/llvm/tools/lldb/scripts/checkpoint-llvm.pl
-REPLACE_PERL+= ${WRKDIR}/llvm/tools/lldb/scripts/disasm-gdb-remote.pl
-REPLACE_PERL+= ${WRKDIR}/llvm/tools/lldb/scripts/generate-vers.pl
-REPLACE_PERL+= ${WRKDIR}/llvm/tools/lldb/scripts/sed-sources
-
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/darwin/heap_find/heap.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/cmdtemplate.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/crashlog.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/delta.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/disasm-stress-test.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/disasm.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/gdbremote.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/globals.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/lldb_module_utils.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/lldbtk.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/mach_o.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/memory.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/operating_system.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/performance.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/process_events.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/sbvalue.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/sources.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/stacks.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/symbolication.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/types.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/x86_64_linux_target_definition.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/x86_64_qemu_target_definition.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/examples/python/x86_64_target_definition.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/packages/Python/lldbsuite/test/attic/tester.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/packages/Python/lldbsuite/test/bench.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/packages/Python/lldbsuite/test/curses_results.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/packages/Python/lldbsuite/test/dosep.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/operating_system.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/operating_system2.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/packages/Python/lldbsuite/test/redo.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/packages/Python/lldbsuite/test/test_runner/test/inferior.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/packages/Python/lldbsuite/test/test_runner/test/process_control_tests.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/scripts/Python/remote-build.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/scripts/buildbot.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/scripts/shush
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/scripts/verify_api.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/scripts/prepare_bindings.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/test/dotest.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/FSM.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/astat.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/bd_client.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/bd_serv.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/cgishell.cgi
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/chess.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/chess2.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/chess3.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/df.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/fix_cvs_files.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/ftp.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/hive.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/monitor.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/passmass.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/python.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/rippy.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/script.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/ssh_tunnel.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/sshls.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/topip.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/pexpect-2.4/examples/uptime.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/third_party/Python/module/progress/progress.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/utils/git-svn/convert.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/utils/lui/lui.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/utils/lui/sandbox.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/utils/misc/grep-svn-log.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/utils/sync-source/syncsource.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/utils/test/disasm.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/utils/test/lldb-disasm.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/utils/test/llvm-mc-shell.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/utils/test/ras.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/utils/test/run-dis.py
-REPLACE_PYTHON+= ${WRKDIR}/llvm/tools/lldb/utils/test/run-until-faulted.py
+REPLACE_PERL+= ${WRKDIR}/lldb/packages/Python/lldbsuite/test/attic/dotest.pl
+REPLACE_PERL+= ${WRKDIR}/lldb/scripts/build-llvm.pl
+REPLACE_PERL+= ${WRKDIR}/lldb/scripts/checkpoint-llvm.pl
+REPLACE_PERL+= ${WRKDIR}/lldb/scripts/disasm-gdb-remote.pl
+REPLACE_PERL+= ${WRKDIR}/lldb/scripts/generate-vers.pl
+REPLACE_PERL+= ${WRKDIR}/lldb/scripts/sed-sources
+
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/darwin/heap_find/heap.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/cmdtemplate.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/crashlog.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/delta.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/disasm-stress-test.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/disasm.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/gdbremote.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/globals.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/lldb_module_utils.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/lldbtk.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/mach_o.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/memory.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/operating_system.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/performance.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/process_events.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/sbvalue.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/sources.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/stacks.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/symbolication.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/types.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/x86_64_linux_target_definition.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/x86_64_qemu_target_definition.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/examples/python/x86_64_target_definition.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/packages/Python/lldbsuite/test/attic/tester.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/packages/Python/lldbsuite/test/bench.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/packages/Python/lldbsuite/test/curses_results.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/packages/Python/lldbsuite/test/dosep.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/operating_system.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/operating_system2.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/packages/Python/lldbsuite/test/redo.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/packages/Python/lldbsuite/test/test_runner/test/inferior.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/packages/Python/lldbsuite/test/test_runner/test/process_control_tests.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/scripts/Python/remote-build.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/scripts/buildbot.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/scripts/shush
+REPLACE_PYTHON+= ${WRKDIR}/lldb/scripts/verify_api.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/scripts/prepare_bindings.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/test/dotest.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/FSM.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/astat.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/bd_client.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/bd_serv.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/cgishell.cgi
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/chess.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/chess2.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/chess3.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/df.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/fix_cvs_files.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/ftp.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/hive.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/monitor.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/passmass.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/python.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/rippy.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/script.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/ssh_tunnel.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/sshls.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/topip.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/pexpect-2.4/examples/uptime.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/third_party/Python/module/progress/progress.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/utils/git-svn/convert.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/utils/lui/lui.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/utils/lui/sandbox.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/utils/misc/grep-svn-log.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/utils/sync-source/syncsource.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/utils/test/disasm.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/utils/test/lldb-disasm.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/utils/test/llvm-mc-shell.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/utils/test/ras.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/utils/test/run-dis.py
+REPLACE_PYTHON+= ${WRKDIR}/lldb/utils/test/run-until-faulted.py
TEST_TARGET= check-lldb
-TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/lib
+TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/build/lib
.if exists(/usr/include/panel.h)
CMAKE_ARGS+= -DLLDB_DISABLE_CURSES:BOOL=FALSE
@@ -119,7 +120,7 @@ CMAKE_ARGS+= -DLLVM_TARGETS_TO_BUILD="X86"
CMAKE_ARG_PATH= ${WRKDIR}/lldb
post-extract:
- ${RUN} mkdir -p ${WRKSRC}
+ ${RUN} mkdir -p ${WRKSRC}/build
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../wip/llvm-git/buildlink3.mk"
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index f8446b6..728ca91 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -12,4 +12,4 @@ 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-source-Initialization-SystemInitializerCommon.cpp) = e7104d4862f88afde1886467d48479d96a3b13c9
+SHA1 (patch-source-Initialization-SystemInitializerCommon.cpp) = 6c1afcccdaae97960c79faa7c83dee5001cc2a17
diff --git a/lldb-git/patches/patch-source-Initialization-SystemInitializerCommon.cpp b/lldb-git/patches/patch-source-Initialization-SystemInitializerCommon.cpp
index cc2c93b..47dca67 100644
--- a/lldb-git/patches/patch-source-Initialization-SystemInitializerCommon.cpp
+++ b/lldb-git/patches/patch-source-Initialization-SystemInitializerCommon.cpp
@@ -1,7 +1,7 @@
$NetBSD$
---- ../lldb/source/Initialization/SystemInitializerCommon.cpp.orig 2015-11-18 04:51:19.000000000 +0000
-+++ ../lldb/source/Initialization/SystemInitializerCommon.cpp
+--- lldb/source/Initialization/SystemInitializerCommon.cpp.orig 2015-11-18 04:51:19.000000000 +0000
++++ lldb/source/Initialization/SystemInitializerCommon.cpp
@@ -115,6 +115,7 @@ SystemInitializerCommon::Initialize()
DynamicLoaderWindowsDYLD::Initialize();
platform_freebsd::PlatformFreeBSD::Initialize();
Home |
Main Index |
Thread Index |
Old Index