From c34923acef63db3b1d16cac5cfcf79f91d655875 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Mon, 21 Oct 2013 19:42:02 +0000 Subject: Correct conflicting ldconfig config files by setting UNIQUENAME. Strip installed libraries with ${STRIP_CMD}. Some whitespace tidying. --- lang/clang32/Makefile | 10 +++++++--- lang/clang33/Makefile | 11 +++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'lang') diff --git a/lang/clang32/Makefile b/lang/clang32/Makefile index 9bc950c70bc4..ddaa7be8368b 100644 --- a/lang/clang32/Makefile +++ b/lang/clang32/Makefile @@ -2,6 +2,7 @@ PORTNAME= clang DISTVERSION= 3.2 +PORTREVISION= 1 CATEGORIES= lang devel MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -108,16 +109,19 @@ post-build: .endif post-install: - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp + ${STRIP_CMD} ${STAGEDIR}${LLVM_PREFIX}/lib/libclang.so + ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ + ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ - ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} + ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*} test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command} ${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \ ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX} .endfor .if ${PORT_OPTIONS:MDOCS} - cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps + cd ${WRKSRC}/tools/clang/docs/tools && \ + ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps .endif ${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \ ${STAGEDIR}${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1 diff --git a/lang/clang33/Makefile b/lang/clang33/Makefile index c84c7c4c10ab..53b3f7e93677 100644 --- a/lang/clang33/Makefile +++ b/lang/clang33/Makefile @@ -2,7 +2,7 @@ PORTNAME= clang DISTVERSION= 3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang devel MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -110,16 +110,19 @@ post-build: .endif post-install: - ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp + ${STRIP_CMD} ${STAGEDIR}${LLVM_PREFIX}/lib/libclang.so + ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ + ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ - ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} + ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*} test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command} ${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \ ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX} .endfor .if ${PORT_OPTIONS:MDOCS} - cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps + cd ${WRKSRC}/tools/clang/docs/tools && \ + ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps .endif ${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \ ${STAGEDIR}${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1 -- cgit v1.2.3