diff options
-rw-r--r-- | lang/clang/distinfo | 3 | ||||
-rw-r--r-- | lang/clang/patches/patch-tools_llvm-shlib_Makefile | 26 | ||||
-rw-r--r-- | lang/libLLVM/Makefile | 10 | ||||
-rw-r--r-- | lang/libLLVM/PLIST | 104 | ||||
-rw-r--r-- | lang/libLLVM/buildlink3.mk | 4 | ||||
-rw-r--r-- | lang/libLLVM34/Makefile | 7 | ||||
-rw-r--r-- | lang/libLLVM34/PLIST | 98 | ||||
-rw-r--r-- | lang/libLLVM34/buildlink3.mk | 4 | ||||
-rw-r--r-- | lang/libLLVM34/distinfo | 3 | ||||
-rw-r--r-- | lang/libLLVM34/patches/patch-tools_llvm-shlib_Makefile | 26 |
10 files changed, 68 insertions, 217 deletions
diff --git a/lang/clang/distinfo b/lang/clang/distinfo index 6c45c3bd7ef..6068d017bfc 100644 --- a/lang/clang/distinfo +++ b/lang/clang/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.30 2015/03/03 16:27:33 tnn Exp $ +$NetBSD: distinfo,v 1.31 2015/04/06 17:25:05 tnn Exp $ SHA1 (cfe-3.6.0.src.tar.xz) = 06b252867a3d118c95ca279fd3c4ac05f6730551 RMD160 (cfe-3.6.0.src.tar.xz) = 2e04853d2f8133fea493ee12d7f05bc6b27dc988 @@ -18,4 +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-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 new file mode 100644 index 00000000000..c44736be69d --- /dev/null +++ b/lang/clang/patches/patch-tools_llvm-shlib_Makefile @@ -0,0 +1,26 @@ +$NetBSD: patch-tools_llvm-shlib_Makefile,v 1.1 2015/04/06 17:25:05 tnn Exp $ + +--- tools/llvm-shlib/Makefile.orig 2014-08-01 06:16:03.000000000 +0000 ++++ tools/llvm-shlib/Makefile +@@ -53,18 +53,18 @@ ifeq ($(HOST_OS),Darwin) + LLVMLibsOptions := $(LLVMLibsOptions) -all_load + endif + +-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) \ + -Wl,--no-whole-archive + endif + +-ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU)) ++ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD NetBSD GNU)) + # Add soname to the library. + LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) + endif + +-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD)) ++ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD NetBSD)) + # Don't allow unresolved symbols. + LLVMLibsOptions += -Wl,--no-undefined + endif diff --git a/lang/libLLVM/Makefile b/lang/libLLVM/Makefile index e7cf5297b89..b6ee9256eb5 100644 --- a/lang/libLLVM/Makefile +++ b/lang/libLLVM/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2015/03/04 19:33:09 tnn Exp $ +# $NetBSD: Makefile,v 1.2 2015/04/06 17:25:05 tnn Exp $ PKGNAME= ${DISTNAME:S/clang/libLLVM/} +PKGREVISION= 1 CONFIGURE_ARGS+= --enable-shared -MAKE_ENV+= SHARED_LIBRARY=1 +MAKE_ENV+= ENABLE_PIC=1 MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/Release/lib BUILD_TARGET= libs-only @@ -32,9 +33,4 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/libLLVM INSTALLATION_DIRS+= lib/libLLVM -BUILDLINK_TRANSFORM+= l:LLVMMipsDesc:LLVMMipsAsmPrinter:LLVMMipsDesc -BUILDLINK_TRANSFORM+= l:LLVMARMDisassembler:LLVMARMInfo:LLVMARMDisassembler -BUILDLINK_TRANSFORM+= l:LLVMSystemZCodeGen:LLVMSystemZDisassembler:LLVMTarget:LLVMSystemZCodeGen -BUILDLINK_TRANSFORM+= l:LLVMSparcCodeGen:LLVMSparcDesc:LLVMSparcCodeGen - .include "../../lang/clang/Makefile.common" diff --git a/lang/libLLVM/PLIST b/lang/libLLVM/PLIST index 6a332b58ccd..16e10245bab 100644 --- a/lang/libLLVM/PLIST +++ b/lang/libLLVM/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/03/04 19:33:09 tnn Exp $ +@comment $NetBSD: PLIST,v 1.2 2015/04/06 17:25:05 tnn Exp $ include/libLLVM/llvm-c/Analysis.h include/libLLVM/llvm-c/BitReader.h include/libLLVM/llvm-c/BitWriter.h @@ -638,209 +638,107 @@ lib/libLLVM/LLVMHello.${SOEXT} lib/libLLVM/libLLVM-3.6.${SOEXT} lib/libLLVM/libLLVM-3.6.0.${SOEXT} lib/libLLVM/libLLVMAArch64AsmParser.a -lib/libLLVM/libLLVMAArch64AsmParser.${SOEXT} lib/libLLVM/libLLVMAArch64AsmPrinter.a -lib/libLLVM/libLLVMAArch64AsmPrinter.${SOEXT} lib/libLLVM/libLLVMAArch64CodeGen.a -lib/libLLVM/libLLVMAArch64CodeGen.${SOEXT} lib/libLLVM/libLLVMAArch64Desc.a -lib/libLLVM/libLLVMAArch64Desc.${SOEXT} lib/libLLVM/libLLVMAArch64Disassembler.a -lib/libLLVM/libLLVMAArch64Disassembler.${SOEXT} lib/libLLVM/libLLVMAArch64Info.a -lib/libLLVM/libLLVMAArch64Info.${SOEXT} lib/libLLVM/libLLVMAArch64Utils.a -lib/libLLVM/libLLVMAArch64Utils.${SOEXT} lib/libLLVM/libLLVMARMAsmParser.a -lib/libLLVM/libLLVMARMAsmParser.${SOEXT} lib/libLLVM/libLLVMARMAsmPrinter.a -lib/libLLVM/libLLVMARMAsmPrinter.${SOEXT} lib/libLLVM/libLLVMARMCodeGen.a -lib/libLLVM/libLLVMARMCodeGen.${SOEXT} lib/libLLVM/libLLVMARMDesc.a -lib/libLLVM/libLLVMARMDesc.${SOEXT} lib/libLLVM/libLLVMARMDisassembler.a -lib/libLLVM/libLLVMARMDisassembler.${SOEXT} lib/libLLVM/libLLVMARMInfo.a -lib/libLLVM/libLLVMARMInfo.${SOEXT} lib/libLLVM/libLLVMAnalysis.a -lib/libLLVM/libLLVMAnalysis.${SOEXT} lib/libLLVM/libLLVMAsmParser.a -lib/libLLVM/libLLVMAsmParser.${SOEXT} lib/libLLVM/libLLVMAsmPrinter.a -lib/libLLVM/libLLVMAsmPrinter.${SOEXT} lib/libLLVM/libLLVMBitReader.a -lib/libLLVM/libLLVMBitReader.${SOEXT} lib/libLLVM/libLLVMBitWriter.a -lib/libLLVM/libLLVMBitWriter.${SOEXT} lib/libLLVM/libLLVMCodeGen.a -lib/libLLVM/libLLVMCodeGen.${SOEXT} lib/libLLVM/libLLVMCore.a -lib/libLLVM/libLLVMCore.${SOEXT} lib/libLLVM/libLLVMCppBackendCodeGen.a -lib/libLLVM/libLLVMCppBackendCodeGen.${SOEXT} lib/libLLVM/libLLVMCppBackendInfo.a -lib/libLLVM/libLLVMCppBackendInfo.${SOEXT} lib/libLLVM/libLLVMDebugInfo.a -lib/libLLVM/libLLVMDebugInfo.${SOEXT} lib/libLLVM/libLLVMExecutionEngine.a -lib/libLLVM/libLLVMExecutionEngine.${SOEXT} lib/libLLVM/libLLVMHexagonCodeGen.a -lib/libLLVM/libLLVMHexagonCodeGen.${SOEXT} lib/libLLVM/libLLVMHexagonDesc.a -lib/libLLVM/libLLVMHexagonDesc.${SOEXT} lib/libLLVM/libLLVMHexagonDisassembler.a -lib/libLLVM/libLLVMHexagonDisassembler.${SOEXT} lib/libLLVM/libLLVMHexagonInfo.a -lib/libLLVM/libLLVMHexagonInfo.${SOEXT} lib/libLLVM/libLLVMIRReader.a -lib/libLLVM/libLLVMIRReader.${SOEXT} lib/libLLVM/libLLVMInstCombine.a -lib/libLLVM/libLLVMInstCombine.${SOEXT} lib/libLLVM/libLLVMInstrumentation.a -lib/libLLVM/libLLVMInstrumentation.${SOEXT} lib/libLLVM/libLLVMInterpreter.a -lib/libLLVM/libLLVMInterpreter.${SOEXT} lib/libLLVM/libLLVMLineEditor.a -lib/libLLVM/libLLVMLineEditor.${SOEXT} lib/libLLVM/libLLVMLinker.a -lib/libLLVM/libLLVMLinker.${SOEXT} lib/libLLVM/libLLVMMC.a -lib/libLLVM/libLLVMMC.${SOEXT} lib/libLLVM/libLLVMMCDisassembler.a -lib/libLLVM/libLLVMMCDisassembler.${SOEXT} lib/libLLVM/libLLVMMCJIT.a -lib/libLLVM/libLLVMMCJIT.${SOEXT} lib/libLLVM/libLLVMMCParser.a -lib/libLLVM/libLLVMMCParser.${SOEXT} lib/libLLVM/libLLVMMSP430AsmPrinter.a -lib/libLLVM/libLLVMMSP430AsmPrinter.${SOEXT} lib/libLLVM/libLLVMMSP430CodeGen.a -lib/libLLVM/libLLVMMSP430CodeGen.${SOEXT} lib/libLLVM/libLLVMMSP430Desc.a -lib/libLLVM/libLLVMMSP430Desc.${SOEXT} lib/libLLVM/libLLVMMSP430Info.a -lib/libLLVM/libLLVMMSP430Info.${SOEXT} lib/libLLVM/libLLVMMipsAsmParser.a -lib/libLLVM/libLLVMMipsAsmParser.${SOEXT} lib/libLLVM/libLLVMMipsAsmPrinter.a -lib/libLLVM/libLLVMMipsAsmPrinter.${SOEXT} lib/libLLVM/libLLVMMipsCodeGen.a -lib/libLLVM/libLLVMMipsCodeGen.${SOEXT} lib/libLLVM/libLLVMMipsDesc.a -lib/libLLVM/libLLVMMipsDesc.${SOEXT} lib/libLLVM/libLLVMMipsDisassembler.a -lib/libLLVM/libLLVMMipsDisassembler.${SOEXT} lib/libLLVM/libLLVMMipsInfo.a -lib/libLLVM/libLLVMMipsInfo.${SOEXT} lib/libLLVM/libLLVMNVPTXAsmPrinter.a -lib/libLLVM/libLLVMNVPTXAsmPrinter.${SOEXT} lib/libLLVM/libLLVMNVPTXCodeGen.a -lib/libLLVM/libLLVMNVPTXCodeGen.${SOEXT} lib/libLLVM/libLLVMNVPTXDesc.a -lib/libLLVM/libLLVMNVPTXDesc.${SOEXT} lib/libLLVM/libLLVMNVPTXInfo.a -lib/libLLVM/libLLVMNVPTXInfo.${SOEXT} lib/libLLVM/libLLVMObjCARCOpts.a -lib/libLLVM/libLLVMObjCARCOpts.${SOEXT} lib/libLLVM/libLLVMObject.a -lib/libLLVM/libLLVMObject.${SOEXT} lib/libLLVM/libLLVMOption.a -lib/libLLVM/libLLVMOption.${SOEXT} lib/libLLVM/libLLVMPowerPCAsmParser.a -lib/libLLVM/libLLVMPowerPCAsmParser.${SOEXT} lib/libLLVM/libLLVMPowerPCAsmPrinter.a -lib/libLLVM/libLLVMPowerPCAsmPrinter.${SOEXT} lib/libLLVM/libLLVMPowerPCCodeGen.a -lib/libLLVM/libLLVMPowerPCCodeGen.${SOEXT} lib/libLLVM/libLLVMPowerPCDesc.a -lib/libLLVM/libLLVMPowerPCDesc.${SOEXT} lib/libLLVM/libLLVMPowerPCDisassembler.a -lib/libLLVM/libLLVMPowerPCDisassembler.${SOEXT} lib/libLLVM/libLLVMPowerPCInfo.a -lib/libLLVM/libLLVMPowerPCInfo.${SOEXT} lib/libLLVM/libLLVMProfileData.a -lib/libLLVM/libLLVMProfileData.${SOEXT} lib/libLLVM/libLLVMR600AsmParser.a -lib/libLLVM/libLLVMR600AsmParser.${SOEXT} lib/libLLVM/libLLVMR600AsmPrinter.a -lib/libLLVM/libLLVMR600AsmPrinter.${SOEXT} lib/libLLVM/libLLVMR600CodeGen.a -lib/libLLVM/libLLVMR600CodeGen.${SOEXT} lib/libLLVM/libLLVMR600Desc.a -lib/libLLVM/libLLVMR600Desc.${SOEXT} lib/libLLVM/libLLVMR600Info.a -lib/libLLVM/libLLVMR600Info.${SOEXT} lib/libLLVM/libLLVMRuntimeDyld.a -lib/libLLVM/libLLVMRuntimeDyld.${SOEXT} lib/libLLVM/libLLVMScalarOpts.a -lib/libLLVM/libLLVMScalarOpts.${SOEXT} lib/libLLVM/libLLVMSelectionDAG.a -lib/libLLVM/libLLVMSelectionDAG.${SOEXT} lib/libLLVM/libLLVMSparcAsmParser.a -lib/libLLVM/libLLVMSparcAsmParser.${SOEXT} lib/libLLVM/libLLVMSparcAsmPrinter.a -lib/libLLVM/libLLVMSparcAsmPrinter.${SOEXT} lib/libLLVM/libLLVMSparcCodeGen.a -lib/libLLVM/libLLVMSparcCodeGen.${SOEXT} lib/libLLVM/libLLVMSparcDesc.a -lib/libLLVM/libLLVMSparcDesc.${SOEXT} lib/libLLVM/libLLVMSparcDisassembler.a -lib/libLLVM/libLLVMSparcDisassembler.${SOEXT} lib/libLLVM/libLLVMSparcInfo.a -lib/libLLVM/libLLVMSparcInfo.${SOEXT} lib/libLLVM/libLLVMSupport.a -lib/libLLVM/libLLVMSupport.${SOEXT} lib/libLLVM/libLLVMSystemZAsmParser.a -lib/libLLVM/libLLVMSystemZAsmParser.${SOEXT} lib/libLLVM/libLLVMSystemZAsmPrinter.a -lib/libLLVM/libLLVMSystemZAsmPrinter.${SOEXT} lib/libLLVM/libLLVMSystemZCodeGen.a -lib/libLLVM/libLLVMSystemZCodeGen.${SOEXT} lib/libLLVM/libLLVMSystemZDesc.a -lib/libLLVM/libLLVMSystemZDesc.${SOEXT} lib/libLLVM/libLLVMSystemZDisassembler.a -lib/libLLVM/libLLVMSystemZDisassembler.${SOEXT} lib/libLLVM/libLLVMSystemZInfo.a -lib/libLLVM/libLLVMSystemZInfo.${SOEXT} lib/libLLVM/libLLVMTableGen.a -lib/libLLVM/libLLVMTableGen.${SOEXT} lib/libLLVM/libLLVMTarget.a -lib/libLLVM/libLLVMTarget.${SOEXT} lib/libLLVM/libLLVMTransformUtils.a -lib/libLLVM/libLLVMTransformUtils.${SOEXT} lib/libLLVM/libLLVMVectorize.a -lib/libLLVM/libLLVMVectorize.${SOEXT} lib/libLLVM/libLLVMX86AsmParser.a -lib/libLLVM/libLLVMX86AsmParser.${SOEXT} lib/libLLVM/libLLVMX86AsmPrinter.a -lib/libLLVM/libLLVMX86AsmPrinter.${SOEXT} lib/libLLVM/libLLVMX86CodeGen.a -lib/libLLVM/libLLVMX86CodeGen.${SOEXT} lib/libLLVM/libLLVMX86Desc.a -lib/libLLVM/libLLVMX86Desc.${SOEXT} lib/libLLVM/libLLVMX86Disassembler.a -lib/libLLVM/libLLVMX86Disassembler.${SOEXT} lib/libLLVM/libLLVMX86Info.a -lib/libLLVM/libLLVMX86Info.${SOEXT} lib/libLLVM/libLLVMX86Utils.a -lib/libLLVM/libLLVMX86Utils.${SOEXT} lib/libLLVM/libLLVMXCoreAsmPrinter.a -lib/libLLVM/libLLVMXCoreAsmPrinter.${SOEXT} lib/libLLVM/libLLVMXCoreCodeGen.a -lib/libLLVM/libLLVMXCoreCodeGen.${SOEXT} lib/libLLVM/libLLVMXCoreDesc.a -lib/libLLVM/libLLVMXCoreDesc.${SOEXT} lib/libLLVM/libLLVMXCoreDisassembler.a -lib/libLLVM/libLLVMXCoreDisassembler.${SOEXT} lib/libLLVM/libLLVMXCoreInfo.a -lib/libLLVM/libLLVMXCoreInfo.${SOEXT} lib/libLLVM/libLLVMipa.a -lib/libLLVM/libLLVMipa.${SOEXT} lib/libLLVM/libLLVMipo.a -lib/libLLVM/libLLVMipo.${SOEXT} lib/libLLVM/libLLVMLTO.a -lib/libLLVM/libLLVMLTO.${SOEXT} libexec/libLLVM/FileCheck libexec/libLLVM/count libexec/libLLVM/llvm-config diff --git a/lang/libLLVM/buildlink3.mk b/lang/libLLVM/buildlink3.mk index 69faf9ce0ae..2a0cd01ed91 100644 --- a/lang/libLLVM/buildlink3.mk +++ b/lang/libLLVM/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/03/04 19:33:09 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2015/04/06 17:25:05 tnn Exp $ BUILDLINK_TREE+= libLLVM .if !defined(LIBLLVM_BUILDLINK3_MK) LIBLLVM_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=3.6.0 +BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=3.6.0nb1 BUILDLINK_PKGSRCDIR.libLLVM?= ../../lang/libLLVM BUILDLINK_INCDIRS.libLLVM?= include/libLLVM BUILDLINK_LIBDIRS.libLLVM?= lib/libLLVM diff --git a/lang/libLLVM34/Makefile b/lang/libLLVM34/Makefile index 955d21ea8e2..d3dad53e6fe 100644 --- a/lang/libLLVM34/Makefile +++ b/lang/libLLVM34/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2015/03/22 16:07:59 tnn Exp $ +# $NetBSD: Makefile,v 1.5 2015/04/06 17:25:05 tnn Exp $ DISTNAME= llvm-${PKGVERSION_NOREV}.src PKGNAME= libLLVM34-3.4.2 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= http://llvm.org/releases/${PKGVERSION_NOREV}/ @@ -25,7 +26,7 @@ CONFIGURE_ARGS+= --disable-bindings CONFIGURE_ARGS+= --disable-timestamps CONFIGURE_ARGS+= --enable-optimized CONFIGURE_ARGS+= --enable-shared -MAKE_ENV+= SHARED_LIBRARY=1 +MAKE_ENV+= ENABLE_PIC=1 MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/Release/lib CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm \ @@ -74,8 +75,6 @@ PLIST_SUBST+= SOEXT="dylib" PLIST_SUBST+= SOEXT="so" .endif -BUILDLINK_TRANSFORM+= l:LLVMMipsDesc:LLVMMipsAsmPrinter:LLVMMipsDesc - .include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/libLLVM34/PLIST b/lang/libLLVM34/PLIST index 6c12bc011df..8ff5030f68c 100644 --- a/lang/libLLVM34/PLIST +++ b/lang/libLLVM34/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/03/04 19:34:27 tnn Exp $ +@comment $NetBSD: PLIST,v 1.2 2015/04/06 17:25:05 tnn Exp $ include/libLLVM34/llvm-c/Analysis.h include/libLLVM34/llvm-c/BitReader.h include/libLLVM34/llvm-c/BitWriter.h @@ -572,196 +572,100 @@ lib/libLLVM34/LLVMHello.${SOEXT} lib/libLLVM34/libLLVM-3.4.2.${SOEXT} lib/libLLVM34/libLLVM-3.4.${SOEXT} lib/libLLVM34/libLLVMAArch64AsmParser.a -lib/libLLVM34/libLLVMAArch64AsmParser.${SOEXT} lib/libLLVM34/libLLVMAArch64AsmPrinter.a -lib/libLLVM34/libLLVMAArch64AsmPrinter.${SOEXT} lib/libLLVM34/libLLVMAArch64CodeGen.a -lib/libLLVM34/libLLVMAArch64CodeGen.${SOEXT} lib/libLLVM34/libLLVMAArch64Desc.a -lib/libLLVM34/libLLVMAArch64Desc.${SOEXT} lib/libLLVM34/libLLVMAArch64Disassembler.a -lib/libLLVM34/libLLVMAArch64Disassembler.${SOEXT} lib/libLLVM34/libLLVMAArch64Info.a -lib/libLLVM34/libLLVMAArch64Info.${SOEXT} lib/libLLVM34/libLLVMAArch64Utils.a -lib/libLLVM34/libLLVMAArch64Utils.${SOEXT} lib/libLLVM34/libLLVMARMAsmParser.a -lib/libLLVM34/libLLVMARMAsmParser.${SOEXT} lib/libLLVM34/libLLVMARMAsmPrinter.a -lib/libLLVM34/libLLVMARMAsmPrinter.${SOEXT} lib/libLLVM34/libLLVMARMCodeGen.a -lib/libLLVM34/libLLVMARMCodeGen.${SOEXT} lib/libLLVM34/libLLVMARMDesc.a -lib/libLLVM34/libLLVMARMDesc.${SOEXT} lib/libLLVM34/libLLVMARMDisassembler.a -lib/libLLVM34/libLLVMARMDisassembler.${SOEXT} lib/libLLVM34/libLLVMARMInfo.a -lib/libLLVM34/libLLVMARMInfo.${SOEXT} lib/libLLVM34/libLLVMAnalysis.a -lib/libLLVM34/libLLVMAnalysis.${SOEXT} lib/libLLVM34/libLLVMAsmParser.a -lib/libLLVM34/libLLVMAsmParser.${SOEXT} lib/libLLVM34/libLLVMAsmPrinter.a -lib/libLLVM34/libLLVMAsmPrinter.${SOEXT} lib/libLLVM34/libLLVMBitReader.a -lib/libLLVM34/libLLVMBitReader.${SOEXT} lib/libLLVM34/libLLVMBitWriter.a -lib/libLLVM34/libLLVMBitWriter.${SOEXT} lib/libLLVM34/libLLVMCodeGen.a -lib/libLLVM34/libLLVMCodeGen.${SOEXT} lib/libLLVM34/libLLVMCore.a -lib/libLLVM34/libLLVMCore.${SOEXT} lib/libLLVM34/libLLVMCppBackendCodeGen.a -lib/libLLVM34/libLLVMCppBackendCodeGen.${SOEXT} lib/libLLVM34/libLLVMCppBackendInfo.a -lib/libLLVM34/libLLVMCppBackendInfo.${SOEXT} lib/libLLVM34/libLLVMDebugInfo.a -lib/libLLVM34/libLLVMDebugInfo.${SOEXT} lib/libLLVM34/libLLVMExecutionEngine.a -lib/libLLVM34/libLLVMExecutionEngine.${SOEXT} lib/libLLVM34/libLLVMHexagonAsmPrinter.a -lib/libLLVM34/libLLVMHexagonAsmPrinter.${SOEXT} lib/libLLVM34/libLLVMHexagonCodeGen.a -lib/libLLVM34/libLLVMHexagonCodeGen.${SOEXT} lib/libLLVM34/libLLVMHexagonDesc.a -lib/libLLVM34/libLLVMHexagonDesc.${SOEXT} lib/libLLVM34/libLLVMHexagonInfo.a -lib/libLLVM34/libLLVMHexagonInfo.${SOEXT} lib/libLLVM34/libLLVMIRReader.a -lib/libLLVM34/libLLVMIRReader.${SOEXT} lib/libLLVM34/libLLVMInstCombine.a -lib/libLLVM34/libLLVMInstCombine.${SOEXT} lib/libLLVM34/libLLVMInstrumentation.a -lib/libLLVM34/libLLVMInstrumentation.${SOEXT} lib/libLLVM34/libLLVMInterpreter.a -lib/libLLVM34/libLLVMInterpreter.${SOEXT} lib/libLLVM34/libLLVMJIT.a -lib/libLLVM34/libLLVMJIT.${SOEXT} lib/libLLVM34/libLLVMLTO.a -lib/libLLVM34/libLLVMLTO.${SOEXT} lib/libLLVM34/libLLVMLinker.a -lib/libLLVM34/libLLVMLinker.${SOEXT} lib/libLLVM34/libLLVMMC.a -lib/libLLVM34/libLLVMMC.${SOEXT} lib/libLLVM34/libLLVMMCDisassembler.a -lib/libLLVM34/libLLVMMCDisassembler.${SOEXT} lib/libLLVM34/libLLVMMCJIT.a -lib/libLLVM34/libLLVMMCJIT.${SOEXT} lib/libLLVM34/libLLVMMCParser.a -lib/libLLVM34/libLLVMMCParser.${SOEXT} lib/libLLVM34/libLLVMMSP430AsmPrinter.a -lib/libLLVM34/libLLVMMSP430AsmPrinter.${SOEXT} lib/libLLVM34/libLLVMMSP430CodeGen.a -lib/libLLVM34/libLLVMMSP430CodeGen.${SOEXT} lib/libLLVM34/libLLVMMSP430Desc.a -lib/libLLVM34/libLLVMMSP430Desc.${SOEXT} lib/libLLVM34/libLLVMMSP430Info.a -lib/libLLVM34/libLLVMMSP430Info.${SOEXT} lib/libLLVM34/libLLVMMipsAsmParser.a -lib/libLLVM34/libLLVMMipsAsmParser.${SOEXT} lib/libLLVM34/libLLVMMipsAsmPrinter.a -lib/libLLVM34/libLLVMMipsAsmPrinter.${SOEXT} lib/libLLVM34/libLLVMMipsCodeGen.a -lib/libLLVM34/libLLVMMipsCodeGen.${SOEXT} lib/libLLVM34/libLLVMMipsDesc.a -lib/libLLVM34/libLLVMMipsDesc.${SOEXT} lib/libLLVM34/libLLVMMipsDisassembler.a -lib/libLLVM34/libLLVMMipsDisassembler.${SOEXT} lib/libLLVM34/libLLVMMipsInfo.a -lib/libLLVM34/libLLVMMipsInfo.${SOEXT} lib/libLLVM34/libLLVMNVPTXAsmPrinter.a -lib/libLLVM34/libLLVMNVPTXAsmPrinter.${SOEXT} lib/libLLVM34/libLLVMNVPTXCodeGen.a -lib/libLLVM34/libLLVMNVPTXCodeGen.${SOEXT} lib/libLLVM34/libLLVMNVPTXDesc.a -lib/libLLVM34/libLLVMNVPTXDesc.${SOEXT} lib/libLLVM34/libLLVMNVPTXInfo.a -lib/libLLVM34/libLLVMNVPTXInfo.${SOEXT} lib/libLLVM34/libLLVMObjCARCOpts.a -lib/libLLVM34/libLLVMObjCARCOpts.${SOEXT} lib/libLLVM34/libLLVMObject.a -lib/libLLVM34/libLLVMObject.${SOEXT} lib/libLLVM34/libLLVMOption.a -lib/libLLVM34/libLLVMOption.${SOEXT} lib/libLLVM34/libLLVMPowerPCAsmParser.a -lib/libLLVM34/libLLVMPowerPCAsmParser.${SOEXT} lib/libLLVM34/libLLVMPowerPCAsmPrinter.a -lib/libLLVM34/libLLVMPowerPCAsmPrinter.${SOEXT} lib/libLLVM34/libLLVMPowerPCCodeGen.a -lib/libLLVM34/libLLVMPowerPCCodeGen.${SOEXT} lib/libLLVM34/libLLVMPowerPCDesc.a -lib/libLLVM34/libLLVMPowerPCDesc.${SOEXT} lib/libLLVM34/libLLVMPowerPCInfo.a -lib/libLLVM34/libLLVMPowerPCInfo.${SOEXT} lib/libLLVM34/libLLVMR600AsmPrinter.a -lib/libLLVM34/libLLVMR600AsmPrinter.${SOEXT} lib/libLLVM34/libLLVMR600CodeGen.a -lib/libLLVM34/libLLVMR600CodeGen.${SOEXT} lib/libLLVM34/libLLVMR600Desc.a -lib/libLLVM34/libLLVMR600Desc.${SOEXT} lib/libLLVM34/libLLVMR600Info.a -lib/libLLVM34/libLLVMR600Info.${SOEXT} lib/libLLVM34/libLLVMRuntimeDyld.a -lib/libLLVM34/libLLVMRuntimeDyld.${SOEXT} lib/libLLVM34/libLLVMScalarOpts.a -lib/libLLVM34/libLLVMScalarOpts.${SOEXT} lib/libLLVM34/libLLVMSelectionDAG.a -lib/libLLVM34/libLLVMSelectionDAG.${SOEXT} lib/libLLVM34/libLLVMSparcCodeGen.a -lib/libLLVM34/libLLVMSparcCodeGen.${SOEXT} lib/libLLVM34/libLLVMSparcDesc.a -lib/libLLVM34/libLLVMSparcDesc.${SOEXT} lib/libLLVM34/libLLVMSparcInfo.a -lib/libLLVM34/libLLVMSparcInfo.${SOEXT} lib/libLLVM34/libLLVMSupport.a -lib/libLLVM34/libLLVMSupport.${SOEXT} lib/libLLVM34/libLLVMSystemZAsmParser.a -lib/libLLVM34/libLLVMSystemZAsmParser.${SOEXT} lib/libLLVM34/libLLVMSystemZAsmPrinter.a -lib/libLLVM34/libLLVMSystemZAsmPrinter.${SOEXT} lib/libLLVM34/libLLVMSystemZCodeGen.a -lib/libLLVM34/libLLVMSystemZCodeGen.${SOEXT} lib/libLLVM34/libLLVMSystemZDesc.a -lib/libLLVM34/libLLVMSystemZDesc.${SOEXT} lib/libLLVM34/libLLVMSystemZDisassembler.a -lib/libLLVM34/libLLVMSystemZDisassembler.${SOEXT} lib/libLLVM34/libLLVMSystemZInfo.a -lib/libLLVM34/libLLVMSystemZInfo.${SOEXT} lib/libLLVM34/libLLVMTableGen.a -lib/libLLVM34/libLLVMTableGen.${SOEXT} lib/libLLVM34/libLLVMTarget.a -lib/libLLVM34/libLLVMTarget.${SOEXT} lib/libLLVM34/libLLVMTransformUtils.a -lib/libLLVM34/libLLVMTransformUtils.${SOEXT} lib/libLLVM34/libLLVMVectorize.a -lib/libLLVM34/libLLVMVectorize.${SOEXT} lib/libLLVM34/libLLVMX86AsmParser.a -lib/libLLVM34/libLLVMX86AsmParser.${SOEXT} lib/libLLVM34/libLLVMX86AsmPrinter.a -lib/libLLVM34/libLLVMX86AsmPrinter.${SOEXT} lib/libLLVM34/libLLVMX86CodeGen.a -lib/libLLVM34/libLLVMX86CodeGen.${SOEXT} lib/libLLVM34/libLLVMX86Desc.a -lib/libLLVM34/libLLVMX86Desc.${SOEXT} lib/libLLVM34/libLLVMX86Disassembler.a -lib/libLLVM34/libLLVMX86Disassembler.${SOEXT} lib/libLLVM34/libLLVMX86Info.a -lib/libLLVM34/libLLVMX86Info.${SOEXT} lib/libLLVM34/libLLVMX86Utils.a -lib/libLLVM34/libLLVMX86Utils.${SOEXT} lib/libLLVM34/libLLVMXCoreAsmPrinter.a -lib/libLLVM34/libLLVMXCoreAsmPrinter.${SOEXT} lib/libLLVM34/libLLVMXCoreCodeGen.a -lib/libLLVM34/libLLVMXCoreCodeGen.${SOEXT} lib/libLLVM34/libLLVMXCoreDesc.a -lib/libLLVM34/libLLVMXCoreDesc.${SOEXT} lib/libLLVM34/libLLVMXCoreDisassembler.a -lib/libLLVM34/libLLVMXCoreDisassembler.${SOEXT} lib/libLLVM34/libLLVMXCoreInfo.a -lib/libLLVM34/libLLVMXCoreInfo.${SOEXT} lib/libLLVM34/libLLVMipa.a -lib/libLLVM34/libLLVMipa.${SOEXT} lib/libLLVM34/libLLVMipo.a -lib/libLLVM34/libLLVMipo.${SOEXT} libexec/libLLVM34/llvm-config libexec/libLLVM34/llvm-tblgen diff --git a/lang/libLLVM34/buildlink3.mk b/lang/libLLVM34/buildlink3.mk index 0e6690fb4e4..28514aaab1f 100644 --- a/lang/libLLVM34/buildlink3.mk +++ b/lang/libLLVM34/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/03/04 19:34:27 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2015/04/06 17:25:05 tnn Exp $ BUILDLINK_TREE+= libLLVM34 .if !defined(LIBLLVM34_BUILDLINK3_MK) LIBLLVM34_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libLLVM34+= libLLVM34>=3.4.2 +BUILDLINK_API_DEPENDS.libLLVM34+= libLLVM34>=3.4.2nb1 BUILDLINK_PKGSRCDIR.libLLVM34?= ../../lang/libLLVM34 BUILDLINK_INCDIRS.libLLVM34?= include/libLLVM34 BUILDLINK_LIBDIRS.libLLVM34?= lib/libLLVM34 diff --git a/lang/libLLVM34/distinfo b/lang/libLLVM34/distinfo index a92ae72af44..43e2cde4e22 100644 --- a/lang/libLLVM34/distinfo +++ b/lang/libLLVM34/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1 2015/03/04 19:34:27 tnn Exp $ +$NetBSD: distinfo,v 1.2 2015/04/06 17:25:05 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-unittests_ExecutionEngine_MCJIT_Makefile) = 468ce096e5f312638923541ecc773435b3244407 diff --git a/lang/libLLVM34/patches/patch-tools_llvm-shlib_Makefile b/lang/libLLVM34/patches/patch-tools_llvm-shlib_Makefile new file mode 100644 index 00000000000..3fc27485df8 --- /dev/null +++ b/lang/libLLVM34/patches/patch-tools_llvm-shlib_Makefile @@ -0,0 +1,26 @@ +$NetBSD: patch-tools_llvm-shlib_Makefile,v 1.1 2015/04/06 17:25:05 tnn Exp $ + +--- tools/llvm-shlib/Makefile.orig 2014-05-15 00:15:27.000000000 +0000 ++++ tools/llvm-shlib/Makefile +@@ -64,18 +64,18 @@ ifeq ($(HOST_OS),Darwin) + endif + endif + +-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) \ + -Wl,--no-whole-archive + endif + +-ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU)) ++ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD NetBSD GNU)) + # Add soname to the library. + LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) + endif + +-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD)) ++ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD NetBSD)) + # Don't allow unresolved symbols. + LLVMLibsOptions += -Wl,--no-undefined + endif |