[pkgsrc/trunk]: pkgsrc/lang Use full paths to archive files instead of -lfoo ...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4e0d83e1e38
branches:  trunk
changeset: 650772:c4e0d83e1e38
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Apr 26 13:08:38 2015 +0000

description:
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:

 lang/clang/distinfo                                    |  4 ++--
 lang/clang/patches/patch-tools_llvm-shlib_Makefile     |  8 ++++++--
 lang/libLLVM34/distinfo                                |  4 ++--
 lang/libLLVM34/patches/patch-tools_llvm-shlib_Makefile |  8 ++++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diffs (73 lines):

diff -r bec3b849d6f8 -r c4e0d83e1e38 lang/clang/distinfo
--- a/lang/clang/distinfo       Sun Apr 26 13:06:27 2015 +0000
+++ b/lang/clang/distinfo       Sun Apr 26 13:08:38 2015 +0000
@@ -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-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 -r bec3b849d6f8 -r c4e0d83e1e38 lang/clang/patches/patch-tools_llvm-shlib_Makefile
--- a/lang/clang/patches/patch-tools_llvm-shlib_Makefile        Sun Apr 26 13:06:27 2015 +0000
+++ b/lang/clang/patches/patch-tools_llvm-shlib_Makefile        Sun Apr 26 13:08:38 2015 +0000
@@ -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 @@
 -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
  
diff -r bec3b849d6f8 -r c4e0d83e1e38 lang/libLLVM34/distinfo
--- a/lang/libLLVM34/distinfo   Sun Apr 26 13:06:27 2015 +0000
+++ b/lang/libLLVM34/distinfo   Sun Apr 26 13:08:38 2015 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/04/06 17:25:05 tnn Exp $
+$NetBSD: distinfo,v 1.3 2015/04/26 13:08:38 tnn Exp $
 
 SHA1 (llvm-3.4.2.src.tar.gz) = c5287384d0b95ecb0fd7f024be2cdfb60cd94bc9
 RMD160 (llvm-3.4.2.src.tar.gz) = 5fab44850977afccee34b21c6d339bc8dea21fce
 Size (llvm-3.4.2.src.tar.gz) = 15938155 bytes
-SHA1 (patch-tools_llvm-shlib_Makefile) = 90d0e31e486733b0d863b4b6018461ff4f7cff53
+SHA1 (patch-tools_llvm-shlib_Makefile) = 84f1c836fbecaf914a475b59077a627be64f7d05
 SHA1 (patch-unittests_ExecutionEngine_MCJIT_Makefile) = 468ce096e5f312638923541ecc773435b3244407
diff -r bec3b849d6f8 -r c4e0d83e1e38 lang/libLLVM34/patches/patch-tools_llvm-shlib_Makefile
--- a/lang/libLLVM34/patches/patch-tools_llvm-shlib_Makefile    Sun Apr 26 13:06:27 2015 +0000
+++ b/lang/libLLVM34/patches/patch-tools_llvm-shlib_Makefile    Sun Apr 26 13:08:38 2015 +0000
@@ -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-05-15 00:15:27.000000000 +0000
 +++ tools/llvm-shlib/Makefile
@@ -9,7 +12,8 @@
 -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