Date: Mon, 21 Oct 2013 19:42:03 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331178 - in head: devel/llvm32 devel/llvm33 lang/clang32 lang/clang33 Message-ID: <201310211942.r9LJg3O3009634@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Mon Oct 21 19:42:02 2013 New Revision: 331178 URL: http://svnweb.freebsd.org/changeset/ports/331178 Log: Correct conflicting ldconfig config files by setting UNIQUENAME. Strip installed libraries with ${STRIP_CMD}. Some whitespace tidying. Modified: head/devel/llvm32/Makefile head/devel/llvm33/Makefile head/lang/clang32/Makefile head/lang/clang33/Makefile Modified: head/devel/llvm32/Makefile ============================================================================== --- head/devel/llvm32/Makefile Mon Oct 21 19:40:09 2013 (r331177) +++ head/devel/llvm32/Makefile Mon Oct 21 19:42:02 2013 (r331178) @@ -2,6 +2,7 @@ PORTNAME= llvm PORTVERSION= 3.2 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -16,6 +17,7 @@ LLVM_SUFFIX= ${PORTVERSION:S/.//g} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} +UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= gmake perl5 GNU_CONFIGURE= yes @@ -73,6 +75,12 @@ COMMANDS= bugpoint \ opt FIRST_COMMAND= ${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} +STRIP_LIBS= BugpointPasses.so \ + LLVMHello.so \ + libLLVM-${PORTVERSION}.so.0 \ + libLTO.so \ + libprofile_rt.so + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MASSERTS} @@ -168,6 +176,7 @@ post-install: ${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME} \ ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}.0 ${LN} -sf ${LIBNAME}.0 ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME} + ${STRIP_CMD} ${STRIP_LIBS:S|^|${STAGEDIR}${LLVM_PREFIX}/lib/|} ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*} Modified: head/devel/llvm33/Makefile ============================================================================== --- head/devel/llvm33/Makefile Mon Oct 21 19:40:09 2013 (r331177) +++ head/devel/llvm33/Makefile Mon Oct 21 19:42:02 2013 (r331178) @@ -2,7 +2,7 @@ PORTNAME= llvm PORTVERSION= 3.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -17,6 +17,7 @@ LLVM_SUFFIX= ${PORTVERSION:S/.//g} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} +UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= gmake perl5 GNU_CONFIGURE= yes @@ -75,6 +76,12 @@ COMMANDS= bugpoint \ opt FIRST_COMMAND= ${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} +STRIP_LIBS= BugpointPasses.so \ + LLVMHello.so \ + libLLVM-${PORTVERSION}.so.0 \ + libLTO.so \ + libprofile_rt.so + # Enable AMD r600 backend used by the r600/radeonsi graphics/dri gallium drivers CONFIGURE_ARGS+=--enable-experimental-targets=R600 @@ -173,6 +180,7 @@ post-install: ${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME} \ ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}.0 ${LN} -sf ${LIBNAME}.0 ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME} + ${STRIP_CMD} ${STRIP_LIBS:S|^|${STAGEDIR}${LLVM_PREFIX}/lib/|} ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*} Modified: head/lang/clang32/Makefile ============================================================================== --- head/lang/clang32/Makefile Mon Oct 21 19:40:09 2013 (r331177) +++ head/lang/clang32/Makefile Mon Oct 21 19:42:02 2013 (r331178) @@ -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 Modified: head/lang/clang33/Makefile ============================================================================== --- head/lang/clang33/Makefile Mon Oct 21 19:40:09 2013 (r331177) +++ head/lang/clang33/Makefile Mon Oct 21 19:42:02 2013 (r331178) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310211942.r9LJg3O3009634>