Teach the llvm shared library build rules about NetBSD so we get a single

shlib with whole-archive like on other platforms. Bump revision and bl3.

3 files changed, 6 insertions, 112 deletions

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