pkgsrc-WIP-changes archive

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

lldb-git: Build out of sources



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Sep 22 09:04:04 2015 +0200
Changeset:	7891de22c46433f7c2b7a9c6d6c00c23d6d4f417

Modified Files:
	lldb-git/Makefile.common
	lldb-git/distinfo
	lldb-git/patches/patch-ab
	lldb-git/patches/patch-ac
	lldb-git/patches/patch-ad
	lldb-git/patches/patch-include_llvm_Support_Host.h
	lldb-git/patches/patch-tools_clang_tools_scan-build_scan-build
	lldb-git/patches/patch-tools_llvm-shlib_Makefile

Log Message:
lldb-git: Build out of sources

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

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

diffstat:
 lldb-git/Makefile.common                                     |  8 +++++---
 lldb-git/distinfo                                            | 12 ++++++------
 lldb-git/patches/patch-ab                                    |  4 ++--
 lldb-git/patches/patch-ac                                    |  4 ++--
 lldb-git/patches/patch-ad                                    |  4 ++--
 lldb-git/patches/patch-include_llvm_Support_Host.h           |  4 ++--
 .../patches/patch-tools_clang_tools_scan-build_scan-build    |  4 ++--
 lldb-git/patches/patch-tools_llvm-shlib_Makefile             |  4 ++--
 8 files changed, 23 insertions(+), 21 deletions(-)

diffs:
diff --git a/lldb-git/Makefile.common b/lldb-git/Makefile.common
index b3fcfd8..92b2997 100644
--- a/lldb-git/Makefile.common
+++ b/lldb-git/Makefile.common
@@ -19,7 +19,8 @@ HOMEPAGE=	http://llvm.org/
 COMMENT=	Low Level Virtual Machine compiler infrastructure
 LICENSE=	modified-bsd
 
-WRKSRC=			${WRKDIR}/llvm
+WRKSRC=			${WRKDIR}/build
+CONFIGURE_SCRIPT=	${WRKDIR}/llvm/configure
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		chown gmake groff gzip pod2html pod2man
@@ -97,8 +98,9 @@ SUBST_SED.libcxx=		-e 's,Major >= 7 || (Major == 6 && Minor == 99 && Micro >= 49
 .endif
 
 post-extract:
-	mv ${WRKDIR}/clang/ ${WRKSRC}/tools
-	mv ${WRKDIR}/lldb/ ${WRKSRC}/tools
+	${RUN} mkdir -p ${WRKSRC}/build
+	${RUN} mv ${WRKDIR}/clang/ ${WRKDIR}/llvm/tools
+	${RUN} mv ${WRKDIR}/lldb/ ${WRKDIR}/llvm/tools
 
 .include "../../wip/mk/git-package.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 4f4f4a9..bb1315f 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -12,9 +12,9 @@ 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-ab) = 018bbc35044ed47a1bfb395e2d2abcda3e21a71a
-SHA1 (patch-ac) = f7e2a21ae47f531dff59438d654e674d38a58bbd
-SHA1 (patch-ad) = e8ed455c1cdcfb4df616bb83db161155048c3265
-SHA1 (patch-include_llvm_Support_Host.h) = 6017ef3b49f42309e10e575b995ecb45938b93b7
-SHA1 (patch-tools_clang_tools_scan-build_scan-build) = 643dc283372afa1790c3461189b94e1bd067ae9c
-SHA1 (patch-tools_llvm-shlib_Makefile) = f32b7aa8ff0e19c8cb4b69d23dc56eac8ca12279
+SHA1 (patch-ab) = 88f3a20c592b90867fdb30b3926804a91cd7e362
+SHA1 (patch-ac) = 337938f9ce2d3db4c749aaaca45126c302b01532
+SHA1 (patch-ad) = 7d6a53a667dd906693ec47c56b121a8b42daf34c
+SHA1 (patch-include_llvm_Support_Host.h) = f57a1b2cb82c2d47453c79054cbeab788917ee40
+SHA1 (patch-tools_clang_tools_scan-build_scan-build) = 6d8a6f2d763856a62587deff64d245511d532777
+SHA1 (patch-tools_llvm-shlib_Makefile) = d49f3cbb859f59b235106cae43ef80a5c1d7f90e
diff --git a/lldb-git/patches/patch-ab b/lldb-git/patches/patch-ab
index 12f333c..241dbcc 100644
--- a/lldb-git/patches/patch-ab
+++ b/lldb-git/patches/patch-ab
@@ -1,7 +1,7 @@
 $NetBSD: patch-ab,v 1.3 2013/01/03 15:19:53 adam Exp $
 
---- docs/Makefile.orig	2015-09-21 20:56:17.000000000 +0000
-+++ docs/Makefile
+--- ../llvm/docs/Makefile.orig	2015-09-21 20:56:17.000000000 +0000
++++ ../llvm/docs/Makefile
 @@ -63,11 +63,10 @@ endif
  # 'make generated BUILD_FOR_WEBSITE=1'
  generated:: $(generated_targets)
diff --git a/lldb-git/patches/patch-ac b/lldb-git/patches/patch-ac
index 8bf6dbb..43722b5 100644
--- a/lldb-git/patches/patch-ac
+++ b/lldb-git/patches/patch-ac
@@ -1,7 +1,7 @@
 $NetBSD: patch-ac,v 1.9 2014/01/19 14:06:41 ryoon Exp $
 
---- Makefile.rules.orig	2015-09-21 20:56:17.000000000 +0000
-+++ Makefile.rules
+--- ../llvm/Makefile.rules.orig	2015-09-21 20:56:17.000000000 +0000
++++ ../llvm/Makefile.rules
 @@ -847,9 +847,6 @@ endif
  # in the file so they get built before dependencies
  #---------------------------------------------------------
diff --git a/lldb-git/patches/patch-ad b/lldb-git/patches/patch-ad
index 1f4dddf..cbbbe7b 100644
--- a/lldb-git/patches/patch-ad
+++ b/lldb-git/patches/patch-ad
@@ -1,7 +1,7 @@
 $NetBSD: patch-ad,v 1.6 2013/05/22 20:51:16 sbd Exp $
 
---- Makefile.config.in.orig	2015-09-21 20:56:17.000000000 +0000
-+++ Makefile.config.in
+--- ../llvm/Makefile.config.in.orig	2015-09-21 20:56:17.000000000 +0000
++++ ../llvm/Makefile.config.in
 @@ -106,11 +106,11 @@ endif
  PROJ_bindir     := $(PROJ_prefix)/bin
  PROJ_libdir     := $(PROJ_prefix)/lib
diff --git a/lldb-git/patches/patch-include_llvm_Support_Host.h b/lldb-git/patches/patch-include_llvm_Support_Host.h
index 5b85a27..55db6f7 100644
--- a/lldb-git/patches/patch-include_llvm_Support_Host.h
+++ b/lldb-git/patches/patch-include_llvm_Support_Host.h
@@ -3,8 +3,8 @@ $NetBSD: patch-include_llvm_Support_Host.h,v 1.2 2014/01/19 14:06:41 ryoon Exp $
 Fix lack of machine/endian.h on solaris
 http://permalink.gmane.org/gmane.comp.compilers.llvm.devel/63225 
 
---- include/llvm/Support/Host.h.orig	2015-09-21 20:56:17.000000000 +0000
-+++ include/llvm/Support/Host.h
+--- ../llvm/include/llvm/Support/Host.h.orig	2015-09-21 20:56:17.000000000 +0000
++++ ../llvm/include/llvm/Support/Host.h
 @@ -18,6 +18,20 @@
  
  #if defined(__linux__) || defined(__GNU__)
diff --git a/lldb-git/patches/patch-tools_clang_tools_scan-build_scan-build b/lldb-git/patches/patch-tools_clang_tools_scan-build_scan-build
index d65214a..884a340 100644
--- a/lldb-git/patches/patch-tools_clang_tools_scan-build_scan-build
+++ b/lldb-git/patches/patch-tools_clang_tools_scan-build_scan-build
@@ -2,8 +2,8 @@ $NetBSD: patch-tools_clang_tools_scan-build_scan-build,v 1.1 2014/10/01 09:41:02
 
 Adapt paths for pkgsrc installation.
 
---- tools/clang/tools/scan-build/scan-build.orig	2015-09-21 20:57:27.000000000 +0000
-+++ tools/clang/tools/scan-build/scan-build
+--- ../llvm/tools/clang/tools/scan-build/scan-build.orig	2015-09-21 20:57:27.000000000 +0000
++++ ../llvm/tools/clang/tools/scan-build/scan-build
 @@ -462,7 +462,7 @@ sub CopyFiles {
  
    my $Dir = shift;
diff --git a/lldb-git/patches/patch-tools_llvm-shlib_Makefile b/lldb-git/patches/patch-tools_llvm-shlib_Makefile
index 3f6a7c4..187b804 100644
--- a/lldb-git/patches/patch-tools_llvm-shlib_Makefile
+++ b/lldb-git/patches/patch-tools_llvm-shlib_Makefile
@@ -3,8 +3,8 @@ $NetBSD: patch-tools_llvm-shlib_Makefile,v 1.2 2015/04/26 13:08:38 tnn Exp $
 Add NetBSD support.
 Use full paths to archive files instead of -lfoo to avoid wrapper reordering.
 
---- tools/llvm-shlib/Makefile.orig	2015-09-21 20:56:18.000000000 +0000
-+++ tools/llvm-shlib/Makefile
+--- ../llvm/tools/llvm-shlib/Makefile.orig	2015-09-21 20:56:18.000000000 +0000
++++ ../llvm/tools/llvm-shlib/Makefile
 @@ -53,18 +53,18 @@ ifeq ($(HOST_OS),Darwin)
      LLVMLibsOptions    := $(LLVMLibsOptions) -all_load
  endif


Home | Main Index | Thread Index | Old Index