Remove shlib option. lang/libLLVM provides equivalent functionality.

2 files changed, 2 insertions, 146 deletions

diff --git a/lang/clang/PLIST.shlib b/lang/clang/PLIST.shlib
deleted file mode 100644
index b9235dd2a0f..00000000000
--- a/lang/clang/PLIST.shlib
+++ /dev/null
@@ -1,129 +0,0 @@
-@comment $NetBSD: PLIST.shlib,v 1.2 2015/03/04 09:59:57 tnn Exp $
-lib/libLLVM-3.6.0.${SOEXT}
-lib/libLLVM-3.6.${SOEXT}
-lib/libLLVMAArch64AsmParser.${SOEXT}
-lib/libLLVMAArch64AsmPrinter.${SOEXT}
-lib/libLLVMAArch64CodeGen.${SOEXT}
-lib/libLLVMAArch64Desc.${SOEXT}
-lib/libLLVMAArch64Disassembler.${SOEXT}
-lib/libLLVMAArch64Info.${SOEXT}
-lib/libLLVMAArch64Utils.${SOEXT}
-lib/libLLVMARMAsmParser.${SOEXT}
-lib/libLLVMARMAsmPrinter.${SOEXT}
-lib/libLLVMARMCodeGen.${SOEXT}
-lib/libLLVMARMDesc.${SOEXT}
-lib/libLLVMARMDisassembler.${SOEXT}
-lib/libLLVMARMInfo.${SOEXT}
-lib/libLLVMAnalysis.${SOEXT}
-lib/libLLVMAsmParser.${SOEXT}
-lib/libLLVMAsmPrinter.${SOEXT}
-lib/libLLVMBitReader.${SOEXT}
-lib/libLLVMBitWriter.${SOEXT}
-lib/libLLVMCodeGen.${SOEXT}
-lib/libLLVMCore.${SOEXT}
-lib/libLLVMCppBackendCodeGen.${SOEXT}
-lib/libLLVMCppBackendInfo.${SOEXT}
-lib/libLLVMDebugInfo.${SOEXT}
-lib/libLLVMExecutionEngine.${SOEXT}
-lib/libLLVMHexagonCodeGen.${SOEXT}
-lib/libLLVMHexagonDesc.${SOEXT}
-lib/libLLVMHexagonDisassembler.${SOEXT}
-lib/libLLVMHexagonInfo.${SOEXT}
-lib/libLLVMIRReader.${SOEXT}
-lib/libLLVMInstCombine.${SOEXT}
-lib/libLLVMInstrumentation.${SOEXT}
-lib/libLLVMInterpreter.${SOEXT}
-lib/libLLVMLTO.${SOEXT}
-lib/libLLVMLineEditor.${SOEXT}
-lib/libLLVMLinker.${SOEXT}
-lib/libLLVMMC.${SOEXT}
-lib/libLLVMMCDisassembler.${SOEXT}
-lib/libLLVMMCJIT.${SOEXT}
-lib/libLLVMMCParser.${SOEXT}
-lib/libLLVMMSP430AsmPrinter.${SOEXT}
-lib/libLLVMMSP430CodeGen.${SOEXT}
-lib/libLLVMMSP430Desc.${SOEXT}
-lib/libLLVMMSP430Info.${SOEXT}
-lib/libLLVMMipsAsmParser.${SOEXT}
-lib/libLLVMMipsAsmPrinter.${SOEXT}
-lib/libLLVMMipsCodeGen.${SOEXT}
-lib/libLLVMMipsDesc.${SOEXT}
-lib/libLLVMMipsDisassembler.${SOEXT}
-lib/libLLVMMipsInfo.${SOEXT}
-lib/libLLVMNVPTXAsmPrinter.${SOEXT}
-lib/libLLVMNVPTXCodeGen.${SOEXT}
-lib/libLLVMNVPTXDesc.${SOEXT}
-lib/libLLVMNVPTXInfo.${SOEXT}
-lib/libLLVMObjCARCOpts.${SOEXT}
-lib/libLLVMObject.${SOEXT}
-lib/libLLVMOption.${SOEXT}
-lib/libLLVMPowerPCAsmParser.${SOEXT}
-lib/libLLVMPowerPCAsmPrinter.${SOEXT}
-lib/libLLVMPowerPCCodeGen.${SOEXT}
-lib/libLLVMPowerPCDesc.${SOEXT}
-lib/libLLVMPowerPCDisassembler.${SOEXT}
-lib/libLLVMPowerPCInfo.${SOEXT}
-lib/libLLVMProfileData.${SOEXT}
-lib/libLLVMR600AsmParser.${SOEXT}
-lib/libLLVMR600AsmPrinter.${SOEXT}
-lib/libLLVMR600CodeGen.${SOEXT}
-lib/libLLVMR600Desc.${SOEXT}
-lib/libLLVMR600Info.${SOEXT}
-lib/libLLVMRuntimeDyld.${SOEXT}
-lib/libLLVMScalarOpts.${SOEXT}
-lib/libLLVMSelectionDAG.${SOEXT}
-lib/libLLVMSparcAsmParser.${SOEXT}
-lib/libLLVMSparcAsmPrinter.${SOEXT}
-lib/libLLVMSparcCodeGen.${SOEXT}
-lib/libLLVMSparcDesc.${SOEXT}
-lib/libLLVMSparcDisassembler.${SOEXT}
-lib/libLLVMSparcInfo.${SOEXT}
-lib/libLLVMSupport.${SOEXT}
-lib/libLLVMSystemZAsmParser.${SOEXT}
-lib/libLLVMSystemZAsmPrinter.${SOEXT}
-lib/libLLVMSystemZCodeGen.${SOEXT}
-lib/libLLVMSystemZDesc.${SOEXT}
-lib/libLLVMSystemZDisassembler.${SOEXT}
-lib/libLLVMSystemZInfo.${SOEXT}
-lib/libLLVMTableGen.${SOEXT}
-lib/libLLVMTarget.${SOEXT}
-lib/libLLVMTransformUtils.${SOEXT}
-lib/libLLVMVectorize.${SOEXT}
-lib/libLLVMX86AsmParser.${SOEXT}
-lib/libLLVMX86AsmPrinter.${SOEXT}
-lib/libLLVMX86CodeGen.${SOEXT}
-lib/libLLVMX86Desc.${SOEXT}
-lib/libLLVMX86Disassembler.${SOEXT}
-lib/libLLVMX86Info.${SOEXT}
-lib/libLLVMX86Utils.${SOEXT}
-lib/libLLVMXCoreAsmPrinter.${SOEXT}
-lib/libLLVMXCoreCodeGen.${SOEXT}
-lib/libLLVMXCoreDesc.${SOEXT}
-lib/libLLVMXCoreDisassembler.${SOEXT}
-lib/libLLVMXCoreInfo.${SOEXT}
-lib/libLLVMipa.${SOEXT}
-lib/libLLVMipo.${SOEXT}
-lib/libclangARCMigrate.${SOEXT}
-lib/libclangAST.${SOEXT}
-lib/libclangASTMatchers.${SOEXT}
-lib/libclangAnalysis.${SOEXT}
-lib/libclangBasic.${SOEXT}
-lib/libclangCodeGen.${SOEXT}
-lib/libclangDriver.${SOEXT}
-lib/libclangDynamicASTMatchers.${SOEXT}
-lib/libclangEdit.${SOEXT}
-lib/libclangFormat.${SOEXT}
-lib/libclangFrontend.${SOEXT}
-lib/libclangFrontendTool.${SOEXT}
-lib/libclangIndex.${SOEXT}
-lib/libclangLex.${SOEXT}
-lib/libclangParse.${SOEXT}
-lib/libclangRewrite.${SOEXT}
-lib/libclangRewriteFrontend.${SOEXT}
-lib/libclangSema.${SOEXT}
-lib/libclangSerialization.${SOEXT}
-lib/libclangStaticAnalyzerCheckers.${SOEXT}
-lib/libclangStaticAnalyzerCore.${SOEXT}
-lib/libclangStaticAnalyzerFrontend.${SOEXT}
-lib/libclangTooling.${SOEXT}
-lib/libclangToolingCore.${SOEXT}
diff --git a/lang/clang/options.mk b/lang/clang/options.mk
index 35309d0b4fc..774e75ec6cc 100644
--- a/lang/clang/options.mk
+++ b/lang/clang/options.mk
@@ -1,28 +1,13 @@
-# $NetBSD: options.mk,v 1.2 2015/03/03 16:27:33 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2015/04/03 11:06:57 tnn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clang
-PKG_SUPPORTED_OPTIONS=	clang-static-analyzer shlib
+PKG_SUPPORTED_OPTIONS=	clang-static-analyzer
 PKG_SUGGESTED_OPTIONS=	# clang-static-analyzer disabled since it needs python and perl
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_SRC=		${PLIST_SRC_DFLT}
 
-# XXX should be spun off to a libLLVM package when we have a use case for it
-.if !empty(PKG_OPTIONS:Mshlib)
-PLIST_SRC+=		PLIST.shlib
-CONFIGURE_ARGS+=	--enable-shared
-MAKE_ENV+=		SHARED_LIBRARY=1
-MAKE_ENV+=		LD_LIBRARY_PATH=${WRKSRC}/Release/lib
-# fixup shared library dependencies in a less intrusive way than patching
-BUILDLINK_TRANSFORM+=	l:clangTooling:clangToolingCore:clangASTMatchers:clangTooling
-BUILDLINK_TRANSFORM+=	l:LLVMMipsDesc:LLVMMipsAsmPrinter:LLVMMipsDesc
-BUILDLINK_TRANSFORM+=	l:LLVMARMAsmParser:LLVMARMInfo:LLVMARMAsmParser
-BUILDLINK_TRANSFORM+=	l:clangARCMigrate:clangStaticAnalyzerCore:clangStaticAnalyzerCheckers:clangARCMigrate
-BUILDLINK_TRANSFORM+=	l:clangStaticAnalyzerCheckers:clangStaticAnalyzerCore:clangStaticAnalyzerCheckers
-BUILDLINK_TRANSFORM+=	l:clangFrontendTool:clangStaticAnalyzerFrontend:clangFrontendTool
-.endif
-
 .if !empty(PKG_OPTIONS:Mclang-static-analyzer)
 PLIST_SRC+=		PLIST.static-analyzer