pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang temporary band-aid for wrapper reordering bug unt...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5231569ced4f
branches:  trunk
changeset: 650681:5231569ced4f
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Apr 25 20:20:32 2015 +0000

description:
temporary band-aid for wrapper reordering bug until we have a proper fix

diffstat:

 lang/libLLVM/Makefile   |  17 ++++++++++++++++-
 lang/libLLVM34/Makefile |  17 ++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r 16ebafe4de41 -r 5231569ced4f lang/libLLVM/Makefile
--- a/lang/libLLVM/Makefile     Sat Apr 25 20:00:23 2015 +0000
+++ b/lang/libLLVM/Makefile     Sat Apr 25 20:20:32 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/06 17:25:05 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/25 20:20:32 tnn Exp $
 
 PKGNAME=               ${DISTNAME:S/clang/libLLVM/}
 PKGREVISION=           1
@@ -33,4 +33,19 @@
 
 INSTALLATION_DIRS+=    lib/libLLVM
 
+# XXX temporary band-aid for wrapper reordering bug until we have a proper fix
+#
+# Wrappers incorrectly reorder:
+#
+# -Wl,--whole-archive -lmystaticlib -Wl,--no-whole-archive
+#
+# to
+#
+# -Wl,--whole-archive -Wl,--no-whole-archive -lmystaticlib
+#
+# Which nullies the effect of --whole-archive.
+# Kludge around this by removing --no-whole-archive from the command line.
+# It happens to be safe in this particular case, as far as I can tell.
+BUILDLINK_TRANSFORM+=  rm:-Wl,--no-whole-archive
+
 .include "../../lang/clang/Makefile.common"
diff -r 16ebafe4de41 -r 5231569ced4f lang/libLLVM34/Makefile
--- a/lang/libLLVM34/Makefile   Sat Apr 25 20:00:23 2015 +0000
+++ b/lang/libLLVM34/Makefile   Sat Apr 25 20:20:32 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/04/06 17:25:05 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2015/04/25 20:20:32 tnn Exp $
 
 DISTNAME=      llvm-${PKGVERSION_NOREV}.src
 PKGNAME=       libLLVM34-3.4.2
@@ -75,6 +75,21 @@
 PLIST_SUBST+=          SOEXT="so"
 .endif
 
+# XXX temporary band-aid for wrapper reordering bug until we have a proper fix
+#
+# Wrappers incorrectly reorder:
+#
+# -Wl,--whole-archive -lmystaticlib -Wl,--no-whole-archive
+#
+# to
+#
+# -Wl,--whole-archive -Wl,--no-whole-archive -lmystaticlib
+#
+# Which nullies the effect of --whole-archive.
+# Kludge around this by removing --no-whole-archive from the command line.
+# It happens to be safe in this particular case, as far as I can tell.
+BUILDLINK_TRANSFORM+=  rm:-Wl,--no-whole-archive
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index