diff options
author | Brooks Davis <brooks@FreeBSD.org> | 2013-10-16 17:34:22 +0000 |
---|---|---|
committer | Brooks Davis <brooks@FreeBSD.org> | 2013-10-16 17:34:22 +0000 |
commit | 5955eb52d91871b28a28bdcd479c2f39ca80d872 (patch) | |
tree | 27b3c2fc52ef5f08472265baa8757e2d08e58e22 /lang | |
parent | enable stage. (diff) |
Upgrade to 3.4.r191854.
STAGIFY
Mark dragonegg IGNORE on systems where the default compiler defaults to
libc++ on the grounds the the clang/llvm ports are likely linked with it
and thus won't work with gcc and libstdc++.
Notes
Notes:
svn path=/head/; revision=330523
Diffstat (limited to 'lang')
-rw-r--r-- | lang/clang-devel/Makefile | 27 | ||||
-rw-r--r-- | lang/clang-devel/distinfo | 8 | ||||
-rw-r--r-- | lang/clang-devel/pkg-plist | 5 | ||||
-rw-r--r-- | lang/dragonegg-devel46/Makefile | 17 | ||||
-rw-r--r-- | lang/dragonegg-devel46/distinfo | 4 |
5 files changed, 36 insertions, 25 deletions
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile index 912c0fbcc3da..fdee82df29fb 100644 --- a/lang/clang-devel/Makefile +++ b/lang/clang-devel/Makefile @@ -50,11 +50,8 @@ MIPS_FPHACK_DESC= MIPS long double hack (breaks ABI) CONFIGURE_ARGS+= --enable-optimized -MAN1= clang.1 - PLIST_SUB+= CLANG_RELEASE=${CLANG_RELEASE} -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MASSERTS} @@ -131,23 +128,24 @@ post-build: @cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} clang.1 post-install: - @${LN} -sf clang ${PREFIX}/bin/clang-cpp + @${LN} -sf clang ${STAGEDIR}${PREFIX}/bin/clang-cpp @${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \ ${WRKSRC}/tools/clang/tools/scan-build/c++-analyzer \ ${WRKSRC}/tools/clang/tools/scan-build/scan-build \ ${WRKSRC}/tools/clang/tools/scan-view/scan-view \ - ${PREFIX}/bin - @${MKDIR} ${PYTHONPREFIX_SITELIBDIR} - @${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/Resources + ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Resources @${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-view/*.py \ - ${PYTHONPREFIX_SITELIBDIR} + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} @${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-view/Resources/* \ - ${PYTHONPREFIX_SITELIBDIR}/Resources - @${MKDIR} ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/scanview.css ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/sorttable.js ${DATADIR} + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Resources + @${MKDIR} ${STAGEDIR}${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/scanview.css \ + ${WRKSRC}/tools/clang/tools/scan-build/sorttable.js \ + ${STAGEDIR}${DATADIR} @${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \ - ${MANPREFIX}/man/man1/ + ${STAGEDIR}${MANPREFIX}/man/man1/ TEST_CMD= '(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} ${GMAKE} check)' regression-test: ${BUILD_COOKIE} @@ -169,7 +167,8 @@ PLIST_FILE_LIST= bin/ccc-analyzer \ bin/clang-tblgen \ bin/scan-build \ bin/scan-view \ - lib/libclang* + lib/libclang* \ + man/man1/clang.1.gz PLIST_DIR_LIST= include/clang \ include/clang-c \ lib/clang diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo index a827f144cd73..aa6bf01bdee3 100644 --- a/lang/clang-devel/distinfo +++ b/lang/clang-devel/distinfo @@ -1,4 +1,4 @@ -SHA256 (clang-3.4.r189172.tar.bz2) = 5b2d5a479316b856e95bfa09ac63e005977a0b948326fe2c6b7209ffc0b324c7 -SIZE (clang-3.4.r189172.tar.bz2) = 8040234 -SHA256 (llvm-3.4.r189172.tar.bz2) = b96be5856796b77747ea8cb1559b7806d96372f70f82f0b4727fa6353e2d3724 -SIZE (llvm-3.4.r189172.tar.bz2) = 11364615 +SHA256 (clang-3.4.r191854.tar.bz2) = 37e9a613adcbdf556abff68d3df68e8a49e77d7110dce29e046702ed59fdff34 +SIZE (clang-3.4.r191854.tar.bz2) = 8163904 +SHA256 (llvm-3.4.r191854.tar.bz2) = 215e2f864549ea6299aa1b003c987f9a5d1a61ea2ad41b3445d2df109bb2c099 +SIZE (llvm-3.4.r191854.tar.bz2) = 11667946 diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist index 321f9faf8d7c..d79dc3c27203 100644 --- a/lang/clang-devel/pkg-plist +++ b/lang/clang-devel/pkg-plist @@ -23,6 +23,7 @@ include/clang/AST/ASTContext.h include/clang/AST/ASTDiagnostic.h include/clang/AST/ASTFwd.h include/clang/AST/ASTImporter.h +include/clang/AST/ASTLambda.h include/clang/AST/ASTMutationListener.h include/clang/AST/ASTTypeTraits.h include/clang/AST/ASTUnresolvedSet.h @@ -311,6 +312,7 @@ include/clang/Rewrite/Frontend/FixItRewriter.h include/clang/Rewrite/Frontend/FrontendActions.h include/clang/Rewrite/Frontend/Rewriters.h include/clang/Sema/AnalysisBasedWarnings.h +include/clang/Sema/AttrParsedAttrImpl.inc include/clang/Sema/AttrParsedAttrKinds.inc include/clang/Sema/AttrParsedAttrList.inc include/clang/Sema/AttrSpellingListIndex.inc @@ -434,7 +436,9 @@ lib/clang/%%CLANG_RELEASE%%/include/popcntintrin.h lib/clang/%%CLANG_RELEASE%%/include/prfchwintrin.h lib/clang/%%CLANG_RELEASE%%/include/rdseedintrin.h lib/clang/%%CLANG_RELEASE%%/include/rtmintrin.h +lib/clang/%%CLANG_RELEASE%%/include/shaintrin.h lib/clang/%%CLANG_RELEASE%%/include/smmintrin.h +lib/clang/%%CLANG_RELEASE%%/include/tbmintrin.h lib/clang/%%CLANG_RELEASE%%/include/tmmintrin.h lib/clang/%%CLANG_RELEASE%%/include/wmmintrin.h lib/clang/%%CLANG_RELEASE%%/include/x86intrin.h @@ -465,6 +469,7 @@ lib/libclangStaticAnalyzerCheckers.a lib/libclangStaticAnalyzerCore.a lib/libclangStaticAnalyzerFrontend.a lib/libclangTooling.a +man/man1/clang.1.gz %%DATADIR%%/scanview.css %%DATADIR%%/sorttable.js %%PORTDOCS%%%%DOCSDIR%%/html.tar.gz diff --git a/lang/dragonegg-devel46/Makefile b/lang/dragonegg-devel46/Makefile index c67f98735b8b..fdb82f8d2c23 100644 --- a/lang/dragonegg-devel46/Makefile +++ b/lang/dragonegg-devel46/Makefile @@ -20,6 +20,7 @@ RUN_DEPENDS+= ${CC}:${PORTSDIR}/lang/gcc \ OPTIONS_DEFINE= DOCS +USES= compiler:features USE_BZIP2= yes USE_GCC= 4.6 USE_GMAKE= yes @@ -33,7 +34,6 @@ GCC_LIBDIR= lib/${CC} ALL_TARGET= MAKE_ARGS= GCC=${LOCALBASE}/bin/${CC} VERBOSE=1 -NO_STAGE= yes .include "${.CURDIR}/../../devel/llvm-devel/Makefile.svn_rev" PLIST_FILES= ${GCC_LIBDIR}/${DRAGONEGG_SO} @@ -44,6 +44,12 @@ PLIST_FILES= ${GCC_LIBDIR}/${DRAGONEGG_SO} PORTDOCS= README .endif +.include <bsd.port.pre.mk> + +.if ${COMPILER_FEATURES:Mlibc++} +IGNORE= "Dragonegg can't work if LLVM was built with libc++" +.endif + .if defined(BOOTSTRAP) || defined(SVN_FETCH) FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion @@ -66,11 +72,12 @@ post-patch: ${WRKSRC}/README do-install: + mkdir -p ${STAGEDIR}${LOCALBASE}/${GCC_LIBDIR} ${INSTALL_LIB} ${WRKSRC}/dragonegg.so \ - ${LOCALBASE}/${GCC_LIBDIR}/${DRAGONEGG_SO} + ${STAGEDIR}${LOCALBASE}/${GCC_LIBDIR}/${DRAGONEGG_SO} .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/lang/dragonegg-devel46/distinfo b/lang/dragonegg-devel46/distinfo index abd3e88aec43..5c109e3bbb9c 100644 --- a/lang/dragonegg-devel46/distinfo +++ b/lang/dragonegg-devel46/distinfo @@ -1,2 +1,2 @@ -SHA256 (dragonegg-3.4.r189172.tar.bz2) = f44cb89ae8bb302af8694cf000e90d376e296b2635b64c2de73c85fae51973e6 -SIZE (dragonegg-3.4.r189172.tar.bz2) = 397796 +SHA256 (dragonegg-3.4.r191854.tar.bz2) = 2e58f68293e492ffeb8da3c828bc30c83939a9610f2e5d1efa75b078938bea42 +SIZE (dragonegg-3.4.r191854.tar.bz2) = 398552 |