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++.
svn path=/head/; revision=330523
2013-10-16 17:34:22 +00:00 · 2013-10-16 17:34:22 +00:00 · 5955eb52d9 · 2021-03-31 03:12:20 +00:00
commit 5955eb52d9
parent 9e27aedb91
9 changed files with 74 additions and 63 deletions
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@ -38,7 +38,6 @@ OPTIONS_DEFAULT=	CMAKE MANPAGES
 LLVM_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE}

-NO_STAGE=	yes
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MASSERTS}
@ -70,11 +69,11 @@ PLIST_FILES+=		lib/LLVMgold.so
 .endif

 .if ${PORT_OPTIONS:MMANPAGES}
-MAN1=		bugpoint.1 lit.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
+_MAN1=		bugpoint.1 lit.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
 		llvm-bcanalyzer.1 llvm-config.1 llvm-cov.1 llvm-diff.1 \
 		llvm-dis.1 llvm-extract.1 llvm-link.1 llvm-nm.1 \
 		llvm-prof.1 llvm-stress.1 opt.1 tblgen.1
-MLINKS=		lit.1 llvm-lit.1
+PLIST_FILES+=	man/man1/llvm-lit.1.gz ${_MAN1:S|^|man/man1/|:S|$|.gz|}
 .endif

 .include <bsd.port.pre.mk>
@ -139,28 +138,31 @@ post-build:
 .endif

 post-install:
-	${MV} ${PREFIX}/lib/${LIBNAME} ${PREFIX}/lib/${LIBNAME}.0
-	${LN} -sf ${LIBNAME}.0 ${PREFIX}/lib/${LIBNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/utils/lit/lit.py ${PREFIX}/bin/lit
-	${LN} -sf lit ${PREFIX}/bin/llvm-lit
-	${MKDIR} ${PYTHON_SITELIBDIR}/lit
-	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py ${PYTHON_SITELIBDIR}/lit
-	${INSTALL_PROGRAM} ${WRKSRC}/Release/bin/FileCheck ${PREFIX}/bin/
+	${MV} ${STAGEDIR}${PREFIX}/lib/${LIBNAME} ${STAGEDIR}${PREFIX}/lib/${LIBNAME}.0
+	${LN} -sf ${LIBNAME}.0 ${STAGEDIR}${PREFIX}/lib/${LIBNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/lit/lit.py ${STAGEDIR}${PREFIX}/bin/lit
+	${LN} -sf lit ${STAGEDIR}${PREFIX}/bin/llvm-lit
+	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit
+	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py ${STAGEDIR}${PYTHON_SITELIBDIR}/lit
+	${INSTALL_PROGRAM} ${WRKSRC}/Release/bin/FileCheck ${STAGEDIR}${PREFIX}/bin/
 .if ${PORT_OPTIONS:MCMAKE}
-	${MKDIR} ${DATADIR}/cmake
-	${INSTALL_DATA} ${WRKSRC}/cmake/modules/*.cmake ${DATADIR}/cmake/
-	${INSTALL_DATA} ${WRKDIR}/cmake/share/llvm/cmake/*.cmake \
-	    ${DATADIR}/cmake/
+	${MKDIR} ${STAGEDIR}${DATADIR}/cmake
+	${INSTALL_DATA} ${WRKSRC}/cmake/modules/*.cmake \
+	    ${WRKDIR}/cmake/share/llvm/cmake/*.cmake \
+	    ${STAGEDIR}${DATADIR}/cmake/
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/html
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${FIND} ${WRKSRC}/docs/_build/html -type f | \
-	    ${XARGS} -I _DOC_ ${INSTALL_DATA} _DOC_ ${DOCSDIR}/html/
+	    ${XARGS} -I _DOC_ ${INSTALL_DATA} _DOC_ ${STAGEDIR}${DOCSDIR}/html/
 .endif
-.for man in ${MAN1}
+.if ${PORT_OPTIONS:MMANPAGES}
+.for man in ${_MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/docs/_build/man/${man} \
-	     ${MANPREFIX}/man/man1/
+	     ${STAGEDIR}${MANPREFIX}/man/man1/
 .endfor
+	${LN} -sf ${STAGEDIR}${MANPREFIX}/man/man1/lit.1 ${STAGEDIR}${MANPREFIX}/man/man1/llvm-lit.1
+.endif

 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${GMAKE} check-local-lit)'
 regression-test: ${BUILD_COOKIE}
@ -176,6 +178,7 @@ PLIST_FILE_LIST=	bin/FileCheck \
 			bin/lit \
 			bin/llc \
 			bin/lli \
+			bin/lli-child-target \
 			bin/llvm-ar \
 			bin/llvm-as \
 			bin/llvm-bcanalyzer \
@ -191,7 +194,7 @@ PLIST_FILE_LIST=	bin/FileCheck \
 			bin/llvm-mcmarkup \
 			bin/llvm-nm \
 			bin/llvm-objdump \
-			bin/llvm-prof \
+			bin/llvm-ranlib \
 			bin/llvm-readobj \
 			bin/llvm-rtdyld \
 			bin/llvm-size \
@ -203,9 +206,7 @@ PLIST_FILE_LIST=	bin/FileCheck \
 			lib/BugpointPasses.so \
 			lib/LLVMHello.so \
 			lib/libLTO.* \
-			lib/libLLVM* \
-			lib/libprofile_rt.a \
-			lib/libprofile_rt.so
+			lib/libLLVM*
 PLIST_DIR_LIST=		include/llvm-c \
 			include/llvm \
 			${PYTHON_SITELIBDIR:S;${PYTHONBASE}/;;}/lit
--- a/devel/llvm-devel/Makefile.svn_rev
+++ b/devel/llvm-devel/Makefile.svn_rev
@ -1 +1 @@
-SVN_REV=	189172
+SVN_REV=	191854
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@ -1,2 +1,2 @@
-SHA256 (llvm-3.4.r189172.tar.bz2) = b96be5856796b77747ea8cb1559b7806d96372f70f82f0b4727fa6353e2d3724
-SIZE (llvm-3.4.r189172.tar.bz2) = 11364615
+SHA256 (llvm-3.4.r191854.tar.bz2) = 215e2f864549ea6299aa1b003c987f9a5d1a61ea2ad41b3445d2df109bb2c099
+SIZE (llvm-3.4.r191854.tar.bz2) = 11667946
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@ -9,12 +9,14 @@
 %%PYTHON_SITELIBDIR%%/lit/__init__.py
 %%PYTHON_SITELIBDIR%%/lit/discovery.py
 %%PYTHON_SITELIBDIR%%/lit/main.py
+%%PYTHON_SITELIBDIR%%/lit/run.py
 %%PYTHON_SITELIBDIR%%/lit/util.py
 bin/FileCheck
 bin/bugpoint
 bin/lit
 bin/llc
 bin/lli
+bin/lli-child-target
 bin/llvm-ar
 bin/llvm-as
 bin/llvm-bcanalyzer
@ -30,7 +32,7 @@ bin/llvm-mc
 bin/llvm-mcmarkup
 bin/llvm-nm
 bin/llvm-objdump
-bin/llvm-prof
+bin/llvm-ranlib
 bin/llvm-readobj
 bin/llvm-rtdyld
 bin/llvm-size
@ -156,14 +158,7 @@ include/llvm/Analysis/MemoryBuiltins.h
 include/llvm/Analysis/MemoryDependenceAnalysis.h
 include/llvm/Analysis/PHITransAddr.h
 include/llvm/Analysis/Passes.h
-include/llvm/Analysis/PathNumbering.h
-include/llvm/Analysis/PathProfileInfo.h
 include/llvm/Analysis/PostDominators.h
-include/llvm/Analysis/ProfileDataLoader.h
-include/llvm/Analysis/ProfileDataTypes.h
-include/llvm/Analysis/ProfileInfo.h
-include/llvm/Analysis/ProfileInfoLoader.h
-include/llvm/Analysis/ProfileInfoTypes.h
 include/llvm/Analysis/PtrUseVisitor.h
 include/llvm/Analysis/RegionInfo.h
 include/llvm/Analysis/RegionIterator.h
@ -269,6 +264,7 @@ include/llvm/CodeGen/SelectionDAG.h
 include/llvm/CodeGen/SelectionDAGISel.h
 include/llvm/CodeGen/SelectionDAGNodes.h
 include/llvm/CodeGen/SlotIndexes.h
+include/llvm/CodeGen/StackProtector.h
 include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
 include/llvm/CodeGen/TargetSchedule.h
 include/llvm/CodeGen/ValueTypes.h
@ -347,6 +343,8 @@ include/llvm/IR/ValueSymbolTable.h
 include/llvm/IRReader/IRReader.h
 include/llvm/InitializePasses.h
 include/llvm/InstVisitor.h
+include/llvm/LTO/LTOCodeGenerator.h
+include/llvm/LTO/LTOModule.h
 include/llvm/LinkAllIR.h
 include/llvm/LinkAllPasses.h
 include/llvm/Linker.h
@ -424,7 +422,6 @@ include/llvm/Object/ELFTypes.h
 include/llvm/Object/ELFYAML.h
 include/llvm/Object/Error.h
 include/llvm/Object/MachO.h
-include/llvm/Object/MachOFormat.h
 include/llvm/Object/MachOUniversal.h
 include/llvm/Object/ObjectFile.h
 include/llvm/Object/RelocVisitor.h
@ -489,8 +486,6 @@ include/llvm/Support/GraphWriter.h
 include/llvm/Support/Host.h
 include/llvm/Support/IncludeFile.h
 include/llvm/Support/InstIterator.h
-include/llvm/Support/IntegersSubset.h
-include/llvm/Support/IntegersSubsetMapping.h
 include/llvm/Support/LEB128.h
 include/llvm/Support/LICENSE.TXT
 include/llvm/Support/LeakDetector.h
@ -540,6 +535,7 @@ include/llvm/Support/Threading.h
 include/llvm/Support/TimeValue.h
 include/llvm/Support/Timer.h
 include/llvm/Support/ToolOutputFile.h
+include/llvm/Support/Unicode.h
 include/llvm/Support/UnicodeCharRanges.h
 include/llvm/Support/Valgrind.h
 include/llvm/Support/ValueHandle.h
@ -556,6 +552,7 @@ include/llvm/TableGen/Error.h
 include/llvm/TableGen/Main.h
 include/llvm/TableGen/Record.h
 include/llvm/TableGen/StringMatcher.h
+include/llvm/TableGen/StringToOffsetTable.h
 include/llvm/TableGen/TableGenBackend.h
 include/llvm/Target/CostTable.h
 include/llvm/Target/Mangler.h
@ -641,6 +638,7 @@ lib/libLLVMInstCombine.a
 lib/libLLVMInstrumentation.a
 lib/libLLVMInterpreter.a
 lib/libLLVMJIT.a
+lib/libLLVMLTO.a
 lib/libLLVMLinker.a
 lib/libLLVMMC.a
 lib/libLLVMMCDisassembler.a
@ -705,8 +703,6 @@ lib/libLLVMipa.a
 lib/libLLVMipo.a
 lib/libLTO.a
 lib/libLTO.so
-lib/libprofile_rt.a
-lib/libprofile_rt.so
 %%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo
 %%PORTDOCS%%%%DOCSDIR%%/html/AliasAnalysis.html
@ -758,6 +754,8 @@ lib/libprofile_rt.so
 %%PORTDOCS%%%%DOCSDIR%%/html/HowToAddABuilder.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/HowToBuildOnARM.html
 %%PORTDOCS%%%%DOCSDIR%%/html/HowToBuildOnARM.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/HowToCrossCompileLLVM.html
+%%PORTDOCS%%%%DOCSDIR%%/html/HowToCrossCompileLLVM.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/HowToReleaseLLVM.html
 %%PORTDOCS%%%%DOCSDIR%%/html/HowToReleaseLLVM.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/HowToSetUpLLVMStyleRTTI.html
@ -946,6 +944,7 @@ lib/libprofile_rt.so
@dirrm include/llvm/Object
@dirrm include/llvm/MC/MCParser
@dirrm include/llvm/MC
+@dirrm include/llvm/LTO
@dirrm include/llvm/IRReader
@dirrm include/llvm/IR
@dirrm include/llvm/ExecutionEngine
--- 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
--- 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
--- 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
--- 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>
--- 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