Index: head/devel/llvm-cheri/Makefile =================================================================== --- head/devel/llvm-cheri/Makefile (revision 456832) +++ head/devel/llvm-cheri/Makefile (revision 456833) @@ -1,309 +1,310 @@ # $FreeBSD$ PORTNAME= llvm PORTVERSION= ${LLVM_MAJOR}.d${SNAPDATE} CATEGORIES= devel lang PKGNAMESUFFIX= ${LLVM_SUFFIX} MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang with support for the CHERI architecture BROKEN_powerpc64= Does not build LLVM_SUFFIX?= -cheri LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} COMMAND_SUFFIX= ${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit perl5 \ shebangfix USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= utils/lit/lit.py utils/llvm-lit/llvm-lit.in \ tools/clang/tools/scan-view/bin/scan-view \ tools/clang/tools/clang-format/git-clang-format \ tools/clang/tools/clang-format/clang-format-diff.py SUB_FILES= llvm-wrapper.sh SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" SUB_FILES+= mips-cheri-clang.mk SUB_LIST+= STACK_ALIGN=${STACK_ALIGN} STACK_ALIGN?= -mstack-alignment=32 CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} CMAKE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON \ -DLLVM_DEFAULT_TARGET_TRIPLE=cheri-unknown-freebsd USE_GITHUB= yes GH_ACCOUNT= CTSRD-CHERI GH_TAGNAME= ${LLVM_COMMIT} .include "Makefile.snapshot" OPTIONS_DEFINE= CLANG DOCS LIT LLD OPTIONS_DEFAULT= CLANG LIT LLD OPTIONS_SUB= yes CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt CLANG_GH_PROJECT= clang:clang CLANG_GH_SUBDIR= tools/clang:clang CLANG_GH_TAGNAME= ${CLANG_COMMIT}:clang CLANG_PORTDOCS= clang DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ -DLLVM_BUILD_DOCS=ON DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|} LIT_DESC= Install lit and FileCheck test tools LLD_DESC= Install lld linker LLD_GH_PROJECT= lld:lld LLD_GH_SUBDIR= tools/lld:lld LLD_GH_TAGNAME= ${LLD_COMMIT}:lld LLD_PORTDOCS= lld LLDB_DESC= Install lldb, the LLVM debugger (ignore on 9.x) -LLDB_BUILD_DEPENDS= swig:devel/swig13 +LLDB_BUILD_DEPENDS= swig3.0:devel/swig30 +LLDB_BINARY_ALIAS= swig=swig3.0 LLDB_GH_PROJECT= lldb:lldb LLDB_GH_TAGNAME= ${LLDB_COMMIT}:lldb OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx LLVM_RELEASE= ${PORTVERSION:C/\.d[0-9]*//} PLIST_SUB+= COMMAND_SUFFIX=${COMMAND_SUFFIX} \ LLVM_RELEASE=${LLVM_RELEASE} \ LLVM_SUFFIX=${LLVM_SUFFIX} COMMANDS= bugpoint \ c-index-test \ llc \ lli \ llvm-ar \ llvm-as \ llvm-bcanalyzer \ llvm-cat \ llvm-cfi-verify \ llvm-config \ llvm-cov \ llvm-cvtres \ llvm-cxxdump \ llvm-cxx-filt \ llvm-diff \ llvm-dis \ llvm-dlltool \ llvm-dsymutil \ llvm-dwarfdump \ llvm-dwp \ llvm-extract \ llvm-lib \ llvm-link \ llvm-lto \ llvm-lto2 \ llvm-mc \ llvm-mcmarkup \ llvm-modextract \ llvm-mt \ llvm-nm \ llvm-objcopy \ llvm-objdump \ llvm-opt-report \ llvm-pdbutil \ llvm-profdata \ llvm-ranlib \ llvm-rc \ llvm-readelf \ llvm-readobj \ llvm-rtdyld \ llvm-size \ llvm-split \ llvm-stress \ llvm-strings \ llvm-symbolizer \ llvm-tblgen \ llvm-xray \ opt \ sancov \ sanstats \ verify-uselistorder \ yaml2obj FIRST_COMMAND= ${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} STRIP_LIBS= BugpointPasses.so \ LLVMHello.so \ ${LIBNAME}.0 \ libLTO.so .include # keep in sync with /usr/src/lib/clang/clang.build.mk CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL} .if ${PORT_OPTIONS:MCLANG} COMMANDS+= clang \ clang++ \ clang-check \ clang-cpp \ clang-format \ clang-refactor \ clang-rename \ scan-build \ scan-view MAN1SRCS+= clang.1 DOCS_PLIST_FILES+= man/man1/scan-build${LLVM_SUFFIX}.1.gz .endif .if ${PORT_OPTIONS:MLIT} MAN1SRCS+= lit.1 FileCheck.1 _USES_PYTHON= python LIT_COMMANDS= lit llvm-lit FileCheck .endif .if ${PORT_OPTIONS:MLLD} COMMANDS+= ld.lld \ ld64.lld .endif .if ${PORT_OPTIONS:MLLDB} COMMANDS+= argdumper \ lldb \ lldb-mi \ lldb-server _USES_PYTHON= python .endif _USES_PYTHON?= python:build USES+= ${_USES_PYTHON} MAN1SRCS+= bugpoint.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \ llvm-bcanalyzer.1 llvm-build.1 llvm-config.1 llvm-cov.1 \ llvm-diff.1 llvm-dis.1 llvm-dwarfdump.1 \ llvm-extract.1 llvm-lib.1 llvm-link.1 llvm-nm.1 \ llvm-pdbutil.1 \ llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \ opt.1 tblgen.1 .include .if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang # Evil hack around gcc48 not providing a usable c++11 environment on 9.x PLIST_SUB:= ${PLIST_SUB:NLLDB=*} LLDB="@comment " .endif post-extract-LLDB-on: .if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang ${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb .endif post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \ -e 's|from lit|from lit${LLVM_SUFFIX}|' \ -e 's|lit\.|lit${LLVM_SUFFIX}.|' \ ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py ${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \ ${WRKSRC}/CMakeLists.txt post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/ ${INSTALL_DATA} ${WRKDIR}/mips-cheri-clang.mk \ ${STAGEDIR}${PREFIX}/share/toolchains/mips${LLVM_SUFFIX}-clang.mk ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${FIRST_COMMAND}${COMMAND_SUFFIX} .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*} ${LN} -f ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${FIRST_COMMAND}${COMMAND_SUFFIX} \ ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${command}${COMMAND_SUFFIX} .endfor post-install-DOCS-on: ${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR} .for _man in ${MAN1SRCS} ${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \ ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1 .endfor .if ! ${PORT_OPTIONS:MLIT} ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1 ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1 .endif ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/ ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/ .if ${PORT_OPTIONS:MCLANG} ${MV} ${STAGEDIR}${LLVM_PREFIX}/man/man1/scan-build.1 \ ${STAGEDIR}${MANPREFIX}/man/man1/scan-build${LLVM_SUFFIX}.1 ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/man/man1 ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/man .endif post-install-LLDB-on: .if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib .endif post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp post-install-LIT-on: ${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \ ${STAGEDIR}${LLVM_PREFIX}/bin/lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}lit${COMMAND_SUFFIX} ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}llvm-lit${COMMAND_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}FileCheck${COMMAND_SUFFIX} TEST_CMD= '(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)' regression-test: ${BUILD_COOKIE} if [ `${ID} -u` = 0 ]; then \ ${CHOWN} -R nobody ${WRKSRC}/test; \ su -m nobody -c ${TEST_CMD}; \ else \ ${SH} -c ${TEST_CMD}; \ fi build-plist: ${RM} ${PLIST} ${PLIST}.tmp ${ECHO_CMD} share/toolchains/mips%%LLVM_SUFFIX%%-clang.mk >> ${PLIST}.tmp .for command in ${COMMANDS} ${ECHO_CMD} bin/${COMMAND_PREFIX}${command}%%COMMAND_SUFFIX%% >> ${PLIST}.tmp .endfor .for command in ${LIT_COMMANDS} ${ECHO_CMD} %%LIT%%bin/${COMMAND_PREFIX}${command}%%COMMAND_SUFFIX%% >> ${PLIST}.tmp ${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:S|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp .endfor ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \ ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \ ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \ -e 's|${PORTVERSION}|%%PORTVERSION%%|' \ -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \ -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \ -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' | \ ${SORT} >> ${PLIST}.tmp ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \ ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \ -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' | \ ${SORT} >> ${PLIST}.tmp awk '{ \ if ($$0 ~ /clang/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} \ if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \ if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} \ print \ }' \${PLIST}.tmp >> ${PLIST} ${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST} ${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST} ${RM} ${PLIST}.tmp check-commands: .for command in ${COMMANDS} test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command} .endfor .include Index: head/devel/llvm38/Makefile =================================================================== --- head/devel/llvm38/Makefile (revision 456832) +++ head/devel/llvm38/Makefile (revision 456833) @@ -1,478 +1,479 @@ # $FreeBSD$ PORTNAME= llvm DISTVERSION= 3.8.1 PORTREVISION= 9 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR} DISTNAME= ${PORTNAME}-${DISTVERSION}.src DISTFILES= ${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX} PKGNAMESUFFIX= ${LLVM_SUFFIX} MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang BROKEN_armv6= fails to compile: fatal error: llvm/IR/Attributes.inc file not found BROKEN_powerpc64= fails to compile: internal compiler error: Killed (program cc1plus) LLVM_RELEASE= ${DISTVERSION:C/rc.*//} RCDIR= ${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|} PRE_= ${DISTVERSION:C/.*rc.*/pre-/:N*[0-9]*} LLVM_SUFFIX= ${DISTVERSION:R:S/.//} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit perl5 tar:xz \ shebangfix USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= utils/lit/lit.py utils/llvm-lit/llvm-lit.in \ tools/clang/tools/scan-view/bin/scan-view \ tools/clang/tools/clang-format/git-clang-format \ tools/clang/tools/clang-format/clang-format-diff.py SUB_FILES= llvm-wrapper.sh SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} CMAKE_ARGS= # Following commit https://github.com/kitware/cmake/commit/956054 # we need to either change the whole man-shuffle below, or simply # redefine CMAKE_INSTALL_MANDIR CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="share/man" OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD LLDB OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPTIONS_SUB= yes PLIST_FILES= CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= \ ${PATCHDIR}/clang-patch-fformat_extensions.diff \ ${PATCHDIR}/clang-patch-fopenmp.diff \ ${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt \ ${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py \ ${PATCHDIR}/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer CLANG_CONFLICTS_INSTALL= clang-devel-3.[1234567]* CLANG_DISTFILES= cfe-${DISTVERSION}.src${EXTRACT_SUFX} CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp CLANG_PORTDOCS= clang COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ -DLLVM_BUILD_DOCS=ON DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|} EXTRAS_DESC= Extra clang tools EXTRAS_IMPLIES= CLANG EXTRAS_DISTFILES= clang-tools-extra-${DISTVERSION}.src${EXTRACT_SUFX} LIT_DESC= Install lit and FileCheck test tools LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} -LLDB_BUILD_DEPENDS= swig:devel/swig13 +LLDB_BUILD_DEPENDS= swig3.0:devel/swig30 +LLDB_BINARY_ALIAS= swig=swig3.0 LLDB_DESC= Install lldb, the LLVM debugger LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} LLDB_IMPLIES= CLANG OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp-patch-bug32279 GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils .if defined(WITH_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif _CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd # Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel .for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP WRKSRC_${option:tl}= ${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//} .endfor OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx PLIST_SUB+= LLVM_RELEASE=${LLVM_RELEASE} COMMANDS= bugpoint \ llc \ lli \ llvm-ar \ llvm-as \ llvm-bcanalyzer \ llvm-config \ llvm-cov \ llvm-diff \ llvm-dis \ llvm-dwarfdump \ llvm-extract \ llvm-link \ llvm-mc \ llvm-mcmarkup \ llvm-nm \ llvm-objdump \ llvm-profdata \ llvm-ranlib \ llvm-readobj \ llvm-rtdyld \ llvm-size \ llvm-split \ llvm-stress \ llvm-symbolizer \ llvm-tblgen \ macho-dump \ opt FIRST_COMMAND= ${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} STRIP_LIBS= BugpointPasses.so \ LLVMHello.so \ ${LIBNAME}.0 \ libLTO.so EXTRAS_COMMANDS+= \ clang-apply-replacements \ clang-modernize \ clang-query \ clang-rename \ clang-tidy \ modularize EXTRAS_LIBS= libclangApplyReplacements \ libclangQuery \ libclangRename \ libclangTidy \ libclangTidyGoogleModule \ libclangTidyLLVMModule \ libclangTidyMiscModule \ libclangTidyReadabilityModule \ libclangTidyUtils \ libmodernizeCore EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTRAS_LIBS:tW:C/ */|/g} .include # keep in sync with /usr/src/lib/clang/clang.build.mk CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL} .if ${PORT_OPTIONS:MCLANG} COMMANDS+= clang \ clang++ \ clang-check \ clang-cpp \ clang-format \ clang-tblgen \ scan-build \ scan-view MAN1SRCS+= clang.1 \ scan-build.1 CLANG_PATTERN= (c-index-test|clang|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer) .endif .if ${PORT_OPTIONS:MLIT} MAN1SRCS+= lit.1 FileCheck.1 _USES_PYTHON= python LIT_COMMANDS= lit llvm-lit FileCheck .endif .if ${PORT_OPTIONS:MLLDB} COMMANDS+= argdumper \ lldb \ lldb-mi \ lldb-server _USES_PYTHON= python .endif .if ! ${OPTIONS_DEFINE:MCOMPILER_RT} # Hack to disable COMPILER_RT in plist of unsupported architectures PLIST_SUB+= COMPILER_RT="@comment " .endif .if ! ${OPTIONS_DEFINE:MGOLD} # Hack to disable GOLD in plist of unsupported architectures PLIST_SUB+= GOLD="@comment " .else .endif .if ! ${OPTIONS_DEFINE:MOPENMP} # Hack to disable OPENMP in plist of unsupported architectures PLIST_SUB+= OPENMP="@comment " .else .endif _USES_PYTHON?= python:build USES+= ${_USES_PYTHON} MAN1SRCS+= bugpoint.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \ llvm-bcanalyzer.1 llvm-build.1 llvm-config.1 llvm-cov.1 \ llvm-diff.1 llvm-dis.1 llvm-dwarfdump.1 \ llvm-extract.1 llvm-lib.1 llvm-link.1 llvm-nm.1 \ llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \ opt.1 tblgen.1 .include .if ${ARCH} == "amd64" _COMPILER_RT_LIBS= \ libclang_rt.asan-preinit-x86_64.a \ libclang_rt.asan-x86_64.a \ libclang_rt.asan-x86_64.a.syms \ libclang_rt.asan-x86_64.so \ libclang_rt.asan_cxx-x86_64.a \ libclang_rt.asan_cxx-x86_64.a.syms \ libclang_rt.builtins-x86_64.a \ libclang_rt.dd-x86_64.a \ libclang_rt.dyndd-x86_64.so \ libclang_rt.lsan-x86_64.a \ libclang_rt.profile-x86_64.a \ libclang_rt.safestack-x86_64.a \ libclang_rt.tsan-x86_64.a \ libclang_rt.tsan-x86_64.a.syms \ libclang_rt.tsan_cxx-x86_64.a \ libclang_rt.tsan_cxx-x86_64.a.syms \ libclang_rt.ubsan_standalone-x86_64.a \ libclang_rt.ubsan_standalone-x86_64.a.syms \ libclang_rt.ubsan_standalone_cxx-x86_64.a \ libclang_rt.ubsan_standalone_cxx-x86_64.a.syms .endif .if ${ARCH} == "i386" _COMPILER_RT_LIBS+= \ libclang_rt.asan-i386.a \ libclang_rt.asan-i386.so \ libclang_rt.asan-preinit-i386.a \ libclang_rt.asan_cxx-i386.a \ libclang_rt.builtins-i386.a \ libclang_rt.profile-i386.a \ libclang_rt.safestack-i386.a \ libclang_rt.ubsan_standalone-i386.a \ libclang_rt.ubsan_standalone_cxx-i386.a .endif .if ${PORT_OPTIONS:MEXTRAS} COMMANDS+= ${EXTRAS_COMMANDS} MAN1SRCS+= extraclangtools.1 PORTDOCS+= clang-tools SHEBANG_FILES+= tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \ tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py .endif .if ${PORT_OPTIONS:MLLD} COMMANDS+= lld PORTDOCS+= lld .endif .if ${PYTHON_REL} < 3400 LLDB_BUILD_DEPENDS+= \ ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 .endif .if ${PORT_OPTIONS:MLLDB} && ${PYTHON_REL} >= 3000 BROKEN= LLDB does not build with Python 3 .endif post-extract-CLANG-on: ${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang post-extract-EXTRAS-on: ${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang/tools/extra post-extract-LLD-on: ${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld post-extract-LLDB-on: ${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb post-extract-OPENMP-on: ${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \ -e 's|from lit|from lit${LLVM_SUFFIX}|' \ -e 's|lit\.|lit${LLVM_SUFFIX}.|' \ ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py ${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \ ${WRKSRC}/CMakeLists.txt post-patch-COMPILER_RT-on: cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-261229 cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-294806 cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-canonical-syscalls cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-ino64 .if ${ARCH} == "amd64" cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-no-m32 .endif post-build-COMPILER_RT-on: ${MKDIR} ${WRKDIR}/compiler-rt-build cd ${WRKDIR}/compiler-rt-build && \ ${CMAKE_BIN} ${CMAKE_ARGS} \ -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \ ${WRKSRC_compiler_rt} && \ ${MAKE_ENV} ${MAKE_CMD} post-patch-CLANG-on: ${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \ ${PATCH_WRKSRC}/tools/clang/lib/Driver/Tools.cpp post-install: ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*} ${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \ ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX} .endfor post-install-DOCS-on: ${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR} .for _man in ${MAN1SRCS} ${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \ ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1 .endfor .if ! ${PORT_OPTIONS:MLIT} ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1 ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1 .endif ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/ ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/ .if ${PORT_OPTIONS:MCLANG} post-install-DOCS-off: ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1 ${RM} -r ${STAGEDIR}${LLVM_PREFIX}/share/man .endif post-install-LLDB-on: ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/lldb/Host/windows/getopt post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/clang-tblgen \ ${STAGEDIR}${LLVM_PREFIX}/bin/ post-install-COMPILER_RT-on: cd ${WRKDIR}/compiler-rt-build && \ ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} ${MKDIR} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR} ${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/* \ ${STAGEDIR}${PREFIX}/${_CRTLIBDIR} ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd post-install-LIT-on: ${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \ ${STAGEDIR}${LLVM_PREFIX}/bin/lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX} ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX} TEST_CMD= '(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)' regression-test: ${BUILD_COOKIE} if [ `${ID} -u` = 0 ]; then \ ${CHOWN} -R nobody ${WRKSRC}/test; \ su -m nobody -c ${TEST_CMD}; \ else \ ${SH} -c ${TEST_CMD}; \ fi build-plist: ${RM} ${PLIST} ${PLIST}.tmp .for command in ${COMMANDS} ${ECHO_CMD} bin/${command}${LLVM_SUFFIX} >> ${PLIST}.tmp .endfor .for command in ${LIT_COMMANDS} ${ECHO_CMD} %%LIT%%bin/${command}${LLVM_SUFFIX} >> ${PLIST}.tmp ${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||}/bin/${command} >> ${PLIST}.tmp .endfor ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \ ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \ ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \ -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \ -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' | \ ${SORT} >> ${PLIST}.tmp ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \ ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' | \ ${SORT} >> ${PLIST}.tmp awk '{ \ if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(omp.h|${EXTRAS_PATTERN}|libclang_rt)/) {printf "%%%%CLANG%%%%"} \ if ($$0 ~ /asan_blacklist.txt|sanitizer/) \ {printf "%%%%COMPILER_RT%%%%"} \ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \ if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} \ if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \ if ($$0 !~ /libclang_rt/) {print}}' ${PLIST}.tmp >> ${PLIST} ${RM} ${PLIST}.tmp check-commands: .for command in ${COMMANDS} test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command} .endfor .if make(svn-patch-clang) .if !defined(PATCH_REV) .error svn-patch-clang requires that PATCH_REV be set .endif _PATCH_FILE=${FILESDIR}/clang-patch-svn-${PATCH_REV} _LLVM_BASE=http://llvm.org/svn/llvm-project/cfe/trunk svn-patch-clang: svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE} svn diff -c ${PATCH_REV} ${_LLVM_BASE} | \ sed -E -e 's;^(---|\+\+\+) ;\1 tools/clang/;' >> ${_PATCH_FILE} .endif .if make(svn-patch-compiler-rt) .if !defined(PATCH_REV) .error svn-patch-compiler-rt requires that PATCH_REV be set .endif _PATCH_FILE=${FILESDIR}/compiler-rt-patch-svn-${PATCH_REV} _LLVM_BASE=http://llvm.org/svn/llvm-project/compiler-rt/trunk svn-patch-compiler-rt: svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE} svn diff -c ${PATCH_REV} ${_LLVM_BASE} | \ sed -E -e 's;^(---|\+\+\+) ;\1 tools/compiler-rt/;' >> ${_PATCH_FILE} .endif .if make(svn-patch-lldb) .if !defined(PATCH_REV) .error svn-patch-lldb requires that PATCH_REV be set .endif _PATCH_FILE=${FILESDIR}/lldb-patch-svn-${PATCH_REV} _LLVM_BASE=http://llvm.org/svn/llvm-project/lldb/trunk svn-patch-lldb: svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE} svn diff -c ${PATCH_REV} ${_LLVM_BASE} | >> ${_PATCH_FILE} .endif .if make(svn-patch-llvm) .if !defined(PATCH_REV) .error svn-patch-llvm requires that PATCH_REV be set .endif _PATCH_FILE=${FILESDIR}/patch-svn-${PATCH_REV} _LLVM_BASE=http://llvm.org/svn/llvm-project/llvm/trunk svn-patch-llvm: svn log -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE} svn diff -c ${PATCH_REV} ${_LLVM_BASE} >> ${_PATCH_FILE} .endif .include Index: head/lang/swift/Makefile =================================================================== --- head/lang/swift/Makefile (revision 456832) +++ head/lang/swift/Makefile (revision 456833) @@ -1,113 +1,114 @@ # $FreeBSD$ PORTNAME= swift PORTVERSION= 3.1.1 DISTVERSIONPREFIX= swift- DISTVERSIONSUFFIX= -RELEASE PORTREVISION= 3 CATEGORIES= lang MAINTAINER= swills@FreeBSD.org COMMENT= Swift programing language LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/swift/LICENSE.txt BUILD_DEPENDS= cmake:devel/cmake \ bash:shells/bash \ - swig:devel/swig13 \ + swig3.0:devel/swig30 \ python:lang/python \ sphinx-build:textproc/py-sphinx \ binutils>=2.25.1:devel/binutils LIB_DEPENDS= libicudata.so:devel/icu \ libuuid.so:misc/e2fsprogs-libuuid \ libobjc.so:lang/libobjc2 REL_SNAP= 2017-04-22-a USE_GITHUB= yes +BINARY_ALIAS= swig=swig3.0 GH_ACCOUNT= apple:DEFAULT,llvm,clang,dispatch,lldb,cmark,llbuild,swiftpm,xctest,xcfound GH_PROJECT= swift:DEFAULT swift-llvm:llvm swift-clang:clang swift-lldb:lldb \ swift-cmark:cmark swift-llbuild:llbuild swift-package-manager:swiftpm \ swift-corelibs-xctest:xctest swift-corelibs-foundation:xcfound \ swift-corelibs-libdispatch:dispatch GH_TAGNAME= swift-${PORTVERSION}-RELEASE:llbuild,swiftpm,xctest,xcfound,dispatch GH_SUBDIR= llvm:llvm clang:clang lldb:lldb cmark:cmark llbuild:llbuild \ swiftpm:swiftpm swift-corelibs-xctest:xctest \ swift-corelibs-foundation:xcfound \ swift-corelibs-libdispatch:dispatch WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USES= autoreconf:build compiler:c++14-lang libtool localbase:ldflags iconv libedit ninja perl5 pkgconfig sqlite USE_AUTOTOOLS= autoconf:env USE_GNOME= libxml2 USE_LDCONFIG= yes ONLY_FOR_ARCHS= amd64 BROKEN_FreeBSD_10= Builds but does not work CONFLICTS_BUILD= googletest LDFLAGS+= -lobjc OPTIONS_DEFINE= DOCS PORTDOCS= * STRIP_FILES= bin/sil-func-extractor bin/sil-nm bin/sil-opt \ bin/sil-passpipeline-dumper bin/swift \ bin/swift-api-digester bin/swift-build-tool \ bin/swift-demangle bin/swift-ide-test \ bin/swift-llvm-opt bin/swift-reflection-dump \ bin/swift-remoteast-test lib/swift/freebsd/libswiftCore.so \ lib/swift/freebsd/libswiftGlibc.so \ lib/swift/freebsd/libswiftRemoteMirror.so \ lib/swift/freebsd/libswiftSwiftOnoneSupport.so .include CC_ONLY= ${CC:C/.*\///} CPP_ONLY= ${CPP:C/.*\///} CXX_ONLY= ${CXX:C/.*\///} post-extract: @${MKDIR} ${WRKSRC} @${MV} ${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}-RELEASE ${WRKSRC}/swift post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/swift/cmake/modules/SwiftSharedCMakeConfig.cmake @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%CPP_ONLY%%|${CPP_ONLY}|g' \ -e 's|%%CC_ONLY%%|${CC_ONLY}|g' \ -e 's|%%CXX_ONLY%%|${CXX_ONLY}|g' \ ${WRKSRC}/swift/utils/build-presets.ini \ ${WRKSRC}/swift/utils/build-script-impl do-build: @${MKDIR} ${STAGEDIR}${PREFIX} cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \ ./swift/utils/build-script --preset=mixin_freebsd_installation \ -j ${MAKE_JOBS_NUMBER} \ install_destdir=${STAGEDIR} \ -- \ ${EXTRA_FLAGS} \ --skip-build-llvm=1 \ --install_prefix=${PREFIX} \ --install_destdir=${STAGEDIR} \ --verbose-build=1 \ --install-llbuild=1 \ --skip-test-llbuild=1 @${RM} /var/run/libuuid/clock.txt /var/run/libuuid/request /var/run/libuuid/uuidd.pid do-install: ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/swift.1 ${STAGEDIR}${PREFIX}/man/man1/swift.1 ${RM} -r ${STAGEDIR}${PREFIX}/share/man ${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/swift.1 .for FILE in ${STRIP_FILES} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${FILE} .endfor do-install-DOCS-on: cd ${WRKSRC}/build/Ninja-ReleaseAssert+stdlib-Release/swift-freebsd-x86_64/docs/html ; \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include