llvm/clang: dylib PLIST fixes

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Thu Feb 25 02:30:54 2016 +0100
Changeset:	d33758d87e8a5d17e16e894b2134dcd767452e67

Modified Files:
	clang-git/Makefile.common
	clang-git/PLIST
	clang/Makefile.common
	clang/PLIST
	llvm-git/Makefile
	llvm-git/PLIST
	llvm/Makefile
	llvm/PLIST

Log Message:
llvm/clang: dylib PLIST fixes

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d33758d87e8a5d17e16e894b2134dcd767452e67

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 clang-git/Makefile.common | 6 ++++++
 clang-git/PLIST           | 4 ++--
 clang/Makefile.common     | 6 ++++++
 clang/PLIST               | 4 ++--
 llvm-git/Makefile         | 7 +++++++
 llvm-git/PLIST            | 6 +++---
 llvm/Makefile             | 7 +++++++
 llvm/PLIST                | 6 +++---
 8 files changed, 36 insertions(+), 10 deletions(-)

diffs:
diff --git a/clang-git/Makefile.common b/clang-git/Makefile.common
index 3f8155e..a57eb90 100644
--- a/clang-git/Makefile.common
+++ b/clang-git/Makefile.common
@@ -76,6 +76,12 @@ SUBST_SED.libcxx=		-e 's,(Major >= 7 || Major == 0),(false),'
 CMAKE_ARGS+=			-DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++"
 .endif
 
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+PLIST_SUBST+=		SOEXT="dylib"
+.else
+PLIST_SUBST+=		SOEXT="so"
+.endif
+
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clang
 PKG_SUPPORTED_OPTIONS=	tests
 
diff --git a/clang-git/PLIST b/clang-git/PLIST
index a8b42ea..4ab4b73 100644
--- a/clang-git/PLIST
+++ b/clang-git/PLIST
@@ -535,8 +535,8 @@ lib/clang/${PKGVERSION}/include/xtestintrin.h
 lib/cmake/clang/ClangConfig.cmake
 lib/cmake/clang/ClangTargets-release.cmake
 lib/cmake/clang/ClangTargets.cmake
-lib/libclang.so
-lib/libclang.so.3.9
+lib/libclang.${SOEXT}
+lib/libclang.${SOEXT}.3.9
 lib/libclangAST.a
 lib/libclangASTMatchers.a
 lib/libclangAnalysis.a
diff --git a/clang/Makefile.common b/clang/Makefile.common
index eef4ab0..f02bff9 100644
--- a/clang/Makefile.common
+++ b/clang/Makefile.common
@@ -76,6 +76,12 @@ SUBST_SED.libcxx=		-e 's,(Major >= 7 || (Major == 6 && Minor == 99 && Micro >= 4
 CMAKE_ARGS+=			-DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++"
 .endif
 
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+PLIST_SUBST+=		SOEXT="dylib"
+.else
+PLIST_SUBST+=		SOEXT="so"
+.endif
+
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clang
 PKG_SUPPORTED_OPTIONS=	tests
 
diff --git a/clang/PLIST b/clang/PLIST
index cc2e7be..bd255ca 100644
--- a/clang/PLIST
+++ b/clang/PLIST
@@ -518,8 +518,8 @@ lib/clang/3.8.0/include/xsaveintrin.h
 lib/clang/3.8.0/include/xsaveoptintrin.h
 lib/clang/3.8.0/include/xsavesintrin.h
 lib/clang/3.8.0/include/xtestintrin.h
-lib/libclang.so
-lib/libclang.so.3.8
+lib/libclang.${SOEXT}
+lib/libclang.${SOEXT}.3.8
 lib/libclangAST.a
 lib/libclangASTMatchers.a
 lib/libclangAnalysis.a
diff --git a/llvm-git/Makefile b/llvm-git/Makefile
index 671af5f..0110877 100644
--- a/llvm-git/Makefile
+++ b/llvm-git/Makefile
@@ -70,6 +70,13 @@ TEST_TARGET=		check
 TEST_ENV+=		LD_LIBRARY_PATH=${WRKDIR}/build/lib
 
 .include "../../mk/bsd.prefs.mk"
+
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+PLIST_SUBST+=		SOEXT="dylib"
+.else
+PLIST_SUBST+=		SOEXT="so"
+.endif
+
 .include "options.mk"
 
 # replacing config.guess is required even for cmake.
diff --git a/llvm-git/PLIST b/llvm-git/PLIST
index 420ea45..9fa447e 100644
--- a/llvm-git/PLIST
+++ b/llvm-git/PLIST
@@ -860,8 +860,8 @@ include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
 include/llvm/Transforms/Utils/UnrollLoop.h
 include/llvm/Transforms/Utils/ValueMapper.h
 include/llvm/Transforms/Vectorize.h
-lib/BugpointPasses.so
-lib/LLVMHello.so
+lib/BugpointPasses.${SOEXT}
+lib/LLVMHello.${SOEXT}
 lib/cmake/llvm/AddLLVM.cmake
 lib/cmake/llvm/AddLLVMDefinitions.cmake
 lib/cmake/llvm/AddOCaml.cmake
@@ -1000,4 +1000,4 @@ ${PLIST.XCore}lib/libLLVMXCoreDesc.a
 ${PLIST.XCore}lib/libLLVMXCoreDisassembler.a
 ${PLIST.XCore}lib/libLLVMXCoreInfo.a
 lib/libLLVMipo.a
-lib/libLTO.so
+lib/libLTO.${SOEXT}
diff --git a/llvm/Makefile b/llvm/Makefile
index cf0113a..e71ff5b 100644
--- a/llvm/Makefile
+++ b/llvm/Makefile
@@ -70,6 +70,13 @@ TEST_TARGET=		check
 TEST_ENV+=		LD_LIBRARY_PATH=${WRKDIR}/build/lib
 
 .include "../../mk/bsd.prefs.mk"
+
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+PLIST_SUBST+=		SOEXT="dylib"
+.else
+PLIST_SUBST+=		SOEXT="so"
+.endif
+
 .include "options.mk"
 
 # replacing config.guess is required even for cmake.
diff --git a/llvm/PLIST b/llvm/PLIST
index 8471fd0..a0bc77d 100644
--- a/llvm/PLIST
+++ b/llvm/PLIST
@@ -840,8 +840,8 @@ include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
 include/llvm/Transforms/Utils/UnrollLoop.h
 include/llvm/Transforms/Utils/ValueMapper.h
 include/llvm/Transforms/Vectorize.h
-lib/BugpointPasses.so
-lib/LLVMHello.so
+lib/BugpointPasses.${SOEXT}
+lib/LLVMHello.${SOEXT}
 ${PLIST.AArch64}lib/libLLVMAArch64AsmParser.a
 ${PLIST.AArch64}lib/libLLVMAArch64AsmPrinter.a
 ${PLIST.AArch64}lib/libLLVMAArch64CodeGen.a
@@ -956,7 +956,7 @@ ${PLIST.XCore}lib/libLLVMXCoreDesc.a
 ${PLIST.XCore}lib/libLLVMXCoreDisassembler.a
 ${PLIST.XCore}lib/libLLVMXCoreInfo.a
 lib/libLLVMipo.a
-lib/libLTO.so
+lib/libLTO.${SOEXT}
 share/llvm/cmake/AddLLVM.cmake
 share/llvm/cmake/AddLLVMDefinitions.cmake
 share/llvm/cmake/AddOCaml.cmake