Sat Apr 25 20:20:32 2015 UTC ()
temporary band-aid for wrapper reordering bug until we have a proper fix


(tnn)
diff -r1.2 -r1.3 pkgsrc/lang/libLLVM/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/libLLVM34/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/lang/libLLVM/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/libLLVM/Makefile 2015/04/06 17:25:05 1.2
+++ pkgsrc/lang/libLLVM/Makefile 2015/04/25 20:20:32 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2015/04/06 17:25:05 tnn Exp $ 1# $NetBSD: Makefile,v 1.3 2015/04/25 20:20:32 tnn Exp $
2 2
3PKGNAME= ${DISTNAME:S/clang/libLLVM/} 3PKGNAME= ${DISTNAME:S/clang/libLLVM/}
4PKGREVISION= 1 4PKGREVISION= 1
5 5
6CONFIGURE_ARGS+= --enable-shared 6CONFIGURE_ARGS+= --enable-shared
7MAKE_ENV+= ENABLE_PIC=1 7MAKE_ENV+= ENABLE_PIC=1
8MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/Release/lib 8MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/Release/lib
9 9
10BUILD_TARGET= libs-only 10BUILD_TARGET= libs-only
11INSTALL_TARGET= install-libs 11INSTALL_TARGET= install-libs
12PYTHON_FOR_BUILD_ONLY= yes 12PYTHON_FOR_BUILD_ONLY= yes
13 13
14SUBST_CLASSES+= fix-pfx 14SUBST_CLASSES+= fix-pfx
@@ -23,14 +23,29 @@ SUBST_SED.fix-pfx+= -e 's,(PROJ_prefix)/ @@ -23,14 +23,29 @@ SUBST_SED.fix-pfx+= -e 's,(PROJ_prefix)/
23 23
24SUBST_CLASSES+= fix-cnf 24SUBST_CLASSES+= fix-cnf
25SUBST_STAGE.fix-cnf= pre-configure 25SUBST_STAGE.fix-cnf= pre-configure
26SUBST_MESSAGE.fix-cnf= Fixing llvm-config paths 26SUBST_MESSAGE.fix-cnf= Fixing llvm-config paths
27SUBST_FILES.fix-cnf= tools/llvm-config/llvm-config.cpp 27SUBST_FILES.fix-cnf= tools/llvm-config/llvm-config.cpp
28SUBST_SED.fix-cnf= -e 's|ActivePrefix + "/include"|"${PREFIX}/include/libLLVM"|g' 28SUBST_SED.fix-cnf= -e 's|ActivePrefix + "/include"|"${PREFIX}/include/libLLVM"|g'
29SUBST_SED.fix-cnf+= -e 's|ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX|"${PREFIX}/lib/libLLVM"|g' 29SUBST_SED.fix-cnf+= -e 's|ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX|"${PREFIX}/lib/libLLVM"|g'
30SUBST_SED.fix-cnf+= -e 's|"-L" << ActiveLibDir|"${COMPILER_RPATH_FLAG}" << ActiveLibDir << " " << &|g' 30SUBST_SED.fix-cnf+= -e 's|"-L" << ActiveLibDir|"${COMPILER_RPATH_FLAG}" << ActiveLibDir << " " << &|g'
31 31
32LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/libLLVM 32LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/libLLVM
33 33
34INSTALLATION_DIRS+= lib/libLLVM 34INSTALLATION_DIRS+= lib/libLLVM
35 35
 36# XXX temporary band-aid for wrapper reordering bug until we have a proper fix
 37#
 38# Wrappers incorrectly reorder:
 39#
 40# -Wl,--whole-archive -lmystaticlib -Wl,--no-whole-archive
 41#
 42# to
 43#
 44# -Wl,--whole-archive -Wl,--no-whole-archive -lmystaticlib
 45#
 46# Which nullies the effect of --whole-archive.
 47# Kludge around this by removing --no-whole-archive from the command line.
 48# It happens to be safe in this particular case, as far as I can tell.
 49BUILDLINK_TRANSFORM+= rm:-Wl,--no-whole-archive
 50
36.include "../../lang/clang/Makefile.common" 51.include "../../lang/clang/Makefile.common"
cvs diff -r1.5 -r1.6 pkgsrc/lang/libLLVM34/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/libLLVM34/Attic/Makefile 2015/04/06 17:25:05 1.5
+++ pkgsrc/lang/libLLVM34/Attic/Makefile 2015/04/25 20:20:32 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2015/04/06 17:25:05 tnn Exp $ 1# $NetBSD: Makefile,v 1.6 2015/04/25 20:20:32 tnn Exp $
2 2
3DISTNAME= llvm-${PKGVERSION_NOREV}.src 3DISTNAME= llvm-${PKGVERSION_NOREV}.src
4PKGNAME= libLLVM34-3.4.2 4PKGNAME= libLLVM34-3.4.2
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://llvm.org/releases/${PKGVERSION_NOREV}/ 7MASTER_SITES= http://llvm.org/releases/${PKGVERSION_NOREV}/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://llvm.org/ 10HOMEPAGE= http://llvm.org/
11COMMENT= Low Level Virtual Machine compiler infrastructure (previous version) 11COMMENT= Low Level Virtual Machine compiler infrastructure (previous version)
12 12
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
@@ -65,16 +65,31 @@ INSTALLATION_DIRS+= lib/libLLVM34 @@ -65,16 +65,31 @@ INSTALLATION_DIRS+= lib/libLLVM34
65# fixes unittest compilation 65# fixes unittest compilation
66_WRAP_EXTRA_ARGS.CXX+= -Wno-error=absolute-value 66_WRAP_EXTRA_ARGS.CXX+= -Wno-error=absolute-value
67CWRAPPERS_APPEND.cxx+= -Wno-error=absolute-value 67CWRAPPERS_APPEND.cxx+= -Wno-error=absolute-value
68.endif 68.endif
69 69
70.include "../../mk/bsd.prefs.mk" 70.include "../../mk/bsd.prefs.mk"
71 71
72.if ${_OPSYS_SHLIB_TYPE} == "dylib" 72.if ${_OPSYS_SHLIB_TYPE} == "dylib"
73PLIST_SUBST+= SOEXT="dylib" 73PLIST_SUBST+= SOEXT="dylib"
74.else 74.else
75PLIST_SUBST+= SOEXT="so" 75PLIST_SUBST+= SOEXT="so"
76.endif 76.endif
77 77
 78# XXX temporary band-aid for wrapper reordering bug until we have a proper fix
 79#
 80# Wrappers incorrectly reorder:
 81#
 82# -Wl,--whole-archive -lmystaticlib -Wl,--no-whole-archive
 83#
 84# to
 85#
 86# -Wl,--whole-archive -Wl,--no-whole-archive -lmystaticlib
 87#
 88# Which nullies the effect of --whole-archive.
 89# Kludge around this by removing --no-whole-archive from the command line.
 90# It happens to be safe in this particular case, as far as I can tell.
 91BUILDLINK_TRANSFORM+= rm:-Wl,--no-whole-archive
 92
78.include "../../devel/zlib/buildlink3.mk" 93.include "../../devel/zlib/buildlink3.mk"
79.include "../../lang/python/tool.mk" 94.include "../../lang/python/tool.mk"
80.include "../../mk/bsd.pkg.mk" 95.include "../../mk/bsd.pkg.mk"