summaryrefslogtreecommitdiff
path: root/lang/clang
diff options
context:
space:
mode:
authortnn <tnn>2015-04-26 13:08:38 +0000
committertnn <tnn>2015-04-26 13:08:38 +0000
commite96d32589b00b2b38ed9cc78a5784b23ff893783 (patch)
treeba916e4174f3e3746b3e0add1edcb01556138e5f /lang/clang
parent5f310ae1fd684830c3dfeddbcc42c4347c1d75c5 (diff)
downloadpkgsrc-e96d32589b00b2b38ed9cc78a5784b23ff893783.tar.gz
Use full paths to archive files instead of -lfoo to avoid wrapper reordering
when linking a shared library out of .a files. This is what other packages that use -Wl,--whole-archive seem to do. This works with and without cwrappers. XXX someone please apply similar fixes for Darwin and SunOS if necessary
Diffstat (limited to 'lang/clang')
-rw-r--r--lang/clang/distinfo4
-rw-r--r--lang/clang/patches/patch-tools_llvm-shlib_Makefile8
2 files changed, 8 insertions, 4 deletions
diff --git a/lang/clang/distinfo b/lang/clang/distinfo
index 6068d017bfc..989b6a59edb 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2015/04/06 17:25:05 tnn Exp $
+$NetBSD: distinfo,v 1.32 2015/04/26 13:08:38 tnn Exp $
SHA1 (cfe-3.6.0.src.tar.xz) = 06b252867a3d118c95ca279fd3c4ac05f6730551
RMD160 (cfe-3.6.0.src.tar.xz) = 2e04853d2f8133fea493ee12d7f05bc6b27dc988
@@ -18,5 +18,5 @@ SHA1 (patch-ad) = ad1f6720e4c73e57fce10ba968b03637a133602d
SHA1 (patch-include_llvm_Support_Host.h) = 545f9542cd2aaa6cea58d3653902b4e1a9e7189a
SHA1 (patch-tools_clang_tools_scan-build_scan-build) = a671f1e513fb43ddc0e73751a78235ab39aeaf9d
SHA1 (patch-tools_lli_Makefile) = 9801878144833b9c871677110183539cd0a08e9a
-SHA1 (patch-tools_llvm-shlib_Makefile) = d2211691b62ca8c22e4e0b8753cd1aab01b1067c
+SHA1 (patch-tools_llvm-shlib_Makefile) = 5cd529e824a935abfe91c4b820cfd9c318e03102
SHA1 (patch-unittests_ExecutionEngine_MCJIT_Makefile) = 8243131319b77f025568592acf9436cf6fe5219c
diff --git a/lang/clang/patches/patch-tools_llvm-shlib_Makefile b/lang/clang/patches/patch-tools_llvm-shlib_Makefile
index c44736be69d..514291f745f 100644
--- a/lang/clang/patches/patch-tools_llvm-shlib_Makefile
+++ b/lang/clang/patches/patch-tools_llvm-shlib_Makefile
@@ -1,4 +1,7 @@
-$NetBSD: patch-tools_llvm-shlib_Makefile,v 1.1 2015/04/06 17:25:05 tnn Exp $
+$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 2014-08-01 06:16:03.000000000 +0000
+++ tools/llvm-shlib/Makefile
@@ -9,7 +12,8 @@ $NetBSD: patch-tools_llvm-shlib_Makefile,v 1.1 2015/04/06 17:25:05 tnn Exp $
-ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD OpenBSD GNU Bitrig))
+ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD NetBSD OpenBSD GNU Bitrig))
# Include everything from the .a's into the shared library.
- LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \
+- LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \
++ LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsPaths) \
-Wl,--no-whole-archive
endif