Index: head/devel/llvm-devel/Makefile =================================================================== --- head/devel/llvm-devel/Makefile (revision 491520) +++ head/devel/llvm-devel/Makefile (revision 491521) @@ -1,553 +1,553 @@ # Created by: Hye-Shik Chang # $FreeBSD$ PORTNAME= llvm PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE} PORTREVISION= 0 CATEGORIES= devel lang PKGNAMESUFFIX= -devel MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang .include "Makefile.LICENSE" +LICENSE+= LLVM2 +LICENSE_FILE_LLVM2= ${WRKSRC}/LICENSE.TXT +LICENSE_NAME_LLVM2= Apache License 2.0 with LLVM Exceptions +LICENSE_PERMS_LLVM2= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LLVM_SUFFIX= -devel LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} BUILD_DEPENDS= USES= cmake compiler:c++11-lib libedit perl5 \ shebangfix USE_LDCONFIG= ${LLVM_PREFIX}/lib _USES_PYTHON?= python:build:2.7 USES+= ${_USES_PYTHON} SHEBANG_FILES= utils/lit/lit.py utils/llvm-lit/llvm-lit.in \ tools/clang/utils/hmaptool/hmaptool \ 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 \ tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \ tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py \ tools/clang/tools/extra/include-fixer/find-all-symbols/tool/run-find-all-symbols.py \ tools/opt-viewer/optrecord.py \ tools/opt-viewer/opt-diff.py \ tools/opt-viewer/opt-stats.py \ tools/opt-viewer/opt-viewer.py SUB_FILES= llvm-wrapper.sh SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} CMAKE_ARGS= -DLLVM_BUILD_LLVM_DYLIB=ON CMAKE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON CMAKE_ARGS+= -DLLVM_ENABLE_RTTI=ON CMAKE_ARGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET} CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} # 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" CMAKE_ARGS+= -DLLVM_PARALLEL_LINK_JOBS=1 # Disable assertions. They should be disabled by cmake, but USES=cmake # overrides -DCMAKE_*_FLAGS_RELEASE. CFLAGS+= -DNDEBUG CXXFLAGS+= -DNDEBUG USE_GITHUB= yes GH_ACCOUNT= llvm-mirror GH_TAGNAME= ${LLVM_COMMIT} .include "Makefile.snapshot" OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPENMP OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD LLDB OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP OPTIONS_SUB= yes PLIST_FILES= CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang CLANG_CONFLICTS_INSTALL= clang-devel-3.[1234567]* CLANG_GH_PROJECT= clang:clang CLANG_GH_SUBDIR= tools/clang:clang CLANG_GH_TAGNAME= ${CLANG_COMMIT}:clang CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp CLANG_PORTDOCS= clang CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_IMPLIES= CLANG COMPILER_RT_GH_PROJECT= compiler-rt:compiler_rt COMPILER_RT_GH_TAGNAME= ${COMPILER_RT_COMMIT}:compiler_rt COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_PORTDOCS= llvm DOCS_BUILD_DEPENDS= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ -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_GH_PROJECT= clang-tools-extra:extras EXTRAS_GH_SUBDIR= tools/clang/tools/extra:extras EXTRAS_GH_TAGNAME= ${EXTRAS_COMMIT}:extras LIT_DESC= Install lit and FileCheck test tools LLD_DESC= Install lld, the LLVM linker LLD_GH_PROJECT= lld:lld LLD_GH_SUBDIR= tools/lld:lld LLD_GH_TAGNAME= ${LLD_COMMIT}:lld LLDB_BUILD_DEPENDS= swig3.0:devel/swig30 LLDB_DESC= Install lldb, the LLVM debugger LLDB_GH_PROJECT= lldb:lldb LLDB_GH_SUBDIR= tools/lldb:lldb LLDB_GH_TAGNAME= ${LLDB_COMMIT}:lldb LLDB_IMPLIES= CLANG LLDB_VARS= _USES_PYTHON=python:2.7 OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_CONFLICTS_INSTALL= libiomp5-devel-* OPENMP_GH_PROJECT= openmp:openmp OPENMP_GH_SUBDIR= projects/openmp:openmp OPENMP_GH_TAGNAME= ${OPENMP_COMMIT}:openmp OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp 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 PLIST_SUB+= LLVM_MAJOR=${LLVM_MAJOR} \ LLVM_RELEASE=${LLVM_RELEASE} COMMANDS= bugpoint \ dsymutil \ llc \ lli \ llvm-ar \ llvm-as \ llvm-bcanalyzer \ llvm-cat \ llvm-cfi-verify \ llvm-config \ llvm-cov \ llvm-cvtres \ llvm-cxxmap \ llvm-diff \ llvm-dis \ llvm-dlltool \ llvm-dwarfdump \ llvm-dwp \ llvm-elfabi \ llvm-exegesis \ llvm-extract \ llvm-link \ llvm-mc \ 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-strip \ llvm-symbolizer \ llvm-tblgen \ llvm-undname \ llvm-xray \ macho-dump \ opt \ sancov FIRST_COMMAND= ${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} MAN1SRCS+= bugpoint.1 \ dsymutil.1 \ llc.1 \ lli.1 \ llvm-ar.1 \ llvm-as.1 \ llvm-bcanalyzer.1 \ llvm-build.1 \ llvm-config.1 \ llvm-cov.1 \ llvm-cxxmap.1 \ llvm-diff.1 \ llvm-dis.1 \ llvm-dwarfdump.1 \ llvm-exegesis.1 \ llvm-extract.1 \ llvm-lib.1 \ llvm-link.1 \ llvm-mca.1 \ llvm-nm.1 \ llvm-objdump.1 \ llvm-pdbutil.1 \ llvm-profdata.1 \ llvm-readobj.1 \ llvm-stress.1 \ llvm-symbolizer.1 \ opt.1 \ tblgen.1 STRIP_LIBS= BugpointPasses.so \ LLVMHello.so \ ${LIBNAME}.0 \ libLTO.so EXTRAS_COMMANDS= \ clang-apply-replacements \ clang-change-namespace \ clang-include-fixer \ clang-modernize \ clang-query \ clang-rename \ clang-reorder-fields \ clang-tidy \ find-all-symbols \ modularize EXTRAS_LIBS= \ libclangApplyReplacements \ libclangIncludeFixer \ libclangRename \ libclangQuery \ libclangTidy \ libclangTidyGoogleModule \ libclangTidyLLVMModule \ libclangTidyMiscModule \ libclangTidyReadabilityModule \ libclangTidyUtils \ libfindAllSymbols \ 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 # ----------- start of sync block ------------------ # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it. # arm (for armv4 and armv5 CPUs) always uses the soft float ABI. # For all other targets, we stick with 'unknown'. .if ${ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") TARGET_ABI= -gnueabihf .elif ${ARCH:Marm*} TARGET_ABI= -gnueabi .else TARGET_ABI= .endif CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-portbld-${OPSYS:tl}${OSREL}${TARGET_ABI} # ----------- end of sync block -------------------- .if ${PORT_OPTIONS:MCLANG} COMMANDS+= c-index-test \ clang \ clang++ \ clang-check \ clang-cpp \ clang-extdef-mapping \ clang-format \ clang-import-test \ clang-offload-bundler \ clangd \ diagtool \ hmaptool \ scan-build \ scan-view MAN1SRCS+= clang.1 \ diagtool.1 \ scan-build.1 CLANG_PATTERN= (c-index-test|clang|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer) USES+= gnome .endif .if ${PORT_OPTIONS:MCOMPILER_RT} COMPILER_RT_PATTERN= (sanitizer|include.xray) .endif .if ${PORT_OPTIONS:MLIT} MAN1SRCS+= lit.1 FileCheck.1 LIT_COMMANDS= lit llvm-lit FileCheck .endif .if ${PORT_OPTIONS:MLLD} COMMANDS+= ld.lld \ ld64.lld \ wasm-ld .endif .if ${PORT_OPTIONS:MLLDB} COMMANDS+= lldb \ lldb-argdumper \ lldb-mi \ lldb-server \ lldb-test \ lldb-vscode .endif .if ! ${OPTIONS_DEFINE:MCOMPILER_RT} # Hack to disable COMPILER_RT in plist of unsupported architectures PLIST_SUB+= COMPILER_RT="@comment " .else .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 .include .if defined(WITH_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif _CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd _CRTBLDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/share _COMPILER_RT_BLACKLISTS= cfi_blacklist.txt .if ${ARCH} == "amd64" _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt _COMPILER_RT_BLACKLISTS+= msan_blacklist.txt _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.cfi-x86_64.a \ libclang_rt.cfi_diag-x86_64.a \ libclang_rt.dd-x86_64.a \ libclang_rt.dyndd-x86_64.so \ libclang_rt.esan-x86_64.a \ libclang_rt.esan-x86_64.a.syms \ libclang_rt.fuzzer-x86_64.a \ libclang_rt.fuzzer_no_main-x86_64.a \ libclang_rt.lsan-x86_64.a \ libclang_rt.msan-x86_64.a \ libclang_rt.msan-x86_64.a.syms \ libclang_rt.msan_cxx-x86_64.a \ libclang_rt.msan_cxx-x86_64.a.syms \ libclang_rt.xray-basic-x86_64.a \ libclang_rt.xray-fdr-x86_64.a \ libclang_rt.xray-profiling-x86_64.a \ libclang_rt.xray-x86_64.a \ libclang_rt.profile-x86_64.a \ libclang_rt.safestack-x86_64.a \ libclang_rt.stats-x86_64.a \ libclang_rt.stats_client-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_minimal-x86_64.a \ libclang_rt.ubsan_minimal-x86_64.a.syms \ libclang_rt.ubsan_minimal-x86_64.so \ libclang_rt.ubsan_standalone-x86_64.a \ libclang_rt.ubsan_standalone-x86_64.a.syms \ libclang_rt.ubsan_standalone-x86_64.so \ libclang_rt.ubsan_standalone_cxx-x86_64.a \ libclang_rt.ubsan_standalone_cxx-x86_64.a.syms .endif .if ${ARCH} == "i386" _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt _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.cfi-i386.a \ libclang_rt.cfi_diag-i386.a \ libclang_rt.lsan-i386.a \ libclang_rt.profile-i386.a \ libclang_rt.safestack-i386.a \ libclang_rt.stats-i386.a \ libclang_rt.stats_client-i386.a \ libclang_rt.ubsan_minimal-i386.a \ libclang_rt.ubsan_minimal-i386.so \ libclang_rt.ubsan_standalone-i386.a \ libclang_rt.ubsan_standalone-i386.so \ libclang_rt.ubsan_standalone_cxx-i386.a .endif .if ${PORT_OPTIONS:MEXTRAS} COMMANDS+= ${EXTRAS_COMMANDS} MAN1SRCS+= extraclangtools.1 PORTDOCS+= clang-tools .endif .if ${PORT_OPTIONS:MLLD} COMMANDS+= lld \ lld-link PORTDOCS+= lld .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-patch-CLANG-on: ${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format - -post-patch-COMPILER_RT-on: - cd ${WRKSRC_compiler_rt} && \ - ${PATCH} -p0 < ${PATCHDIR}/compiler-rt-safestack_platform.h post-build-COMPILER_RT-on: ${MKDIR} ${WRKDIR}/compiler-rt-build cd ${WRKDIR}/compiler-rt-build && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \ ${WRKSRC_compiler_rt} && \ ${MAKE_ENV} ${MAKE_CMD} post-install: ${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: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/* ${STAGEDIR}${DOCSDIR} ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc .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 ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/ ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/ .endif post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp post-install-COMPILER_RT-on: cd ${WRKDIR}/compiler-rt-build && \ ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} .if ${ARCH} == "amd64" ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386* .endif ${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)' do-test: 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} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLIST}.tmp ${ECHO_CMD} "@comment Alter build-plist target and regenerate as required" >> ${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 '_blacklist.txt$$' | \ ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \ ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \ -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \ -e 's|${PORTVERSION}|%%PORTVERSION%%|' \ -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \ -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \ -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \ | ${SORT} >> ${PLIST}.tmp ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \ ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \ -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \ -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' | \ ${SORT} >> ${PLIST}.tmp awk '{ \ if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /omp.h|${EXTRAS_PATTERN}|libclang_rt/) {printf "%%%%CLANG%%%%"} \ if ($$0 ~ /${COMPILER_RT_PATTERN}/) \ {printf "%%%%COMPILER_RT%%%%"} \ if ($$0 ~ /lld|wasm-ld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ if ($$0 ~ /(lib[ig]*omp|omp.h|ompt.h)/) {printf "%%%%OPENMP%%%%"} \ if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \ if ($$0 !~ /libclang_rt/) {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/llvm-devel/Makefile.snapshot =================================================================== --- head/devel/llvm-devel/Makefile.snapshot (revision 491520) +++ head/devel/llvm-devel/Makefile.snapshot (revision 491521) @@ -1,17 +1,17 @@ # $FreeBSD$ # # Generated file! Do not edit! # # Generated by: files/gen-Makefile.snapshot.sh. # LLVM_MAJOR= 9 LLVM_RELEASE= ${LLVM_MAJOR}.0.0 -SNAPDATE= 20190118 +SNAPDATE= 20190122 -LLVM_COMMIT= 5570b0702238f61773d973fe6b8163c535dce2fb -CLANG_COMMIT= 87155c67f399837e1875acd5658a8ff76c3f3164 -COMPILER_RT_COMMIT= 205e34f422a7d170d8a1e53c2cfe6f38e7ea8659 -EXTRAS_COMMIT= 9e454c861c254debad1a0cbac9a56f8d6f84d058 -LLD_COMMIT= 0a0e0cb4cce9d95873248788de7ba620b6918236 -LLDB_COMMIT= f031f20ae94286eba6274f7019db47872af033fd -OPENMP_COMMIT= e223da31a44825cd907ed89306d8bcf3313b3180 +LLVM_COMMIT= 4b96e4b486d2a92e8f7820f6efa2c2aa0023bb66 +CLANG_COMMIT= 7f77c0c9a77506be62cd0c96fbfc1c0c8b3d5220 +COMPILER_RT_COMMIT= 225c642c81174798d0af44148018faa0022ef056 +EXTRAS_COMMIT= 10ead75b2238df9e3ddb19dc73431a57cb0ffb66 +LLD_COMMIT= e4443d35d929f53a03dcfb72283c53c5fe549d23 +LLDB_COMMIT= e29cec1fb4a359e5ac39bc472ad2e48aa4a97229 +OPENMP_COMMIT= c1fe93aaa489a8e621016755bf5269602ab54d8d Index: head/devel/llvm-devel/distinfo =================================================================== --- head/devel/llvm-devel/distinfo (revision 491520) +++ head/devel/llvm-devel/distinfo (revision 491521) @@ -1,15 +1,15 @@ -TIMESTAMP = 1547847258 -SHA256 (llvm-mirror-llvm-9.0.d20190118-5570b0702238f61773d973fe6b8163c535dce2fb_GH0.tar.gz) = 8b359d4ef2a73e044b1d570d7abb343c10842c071121d8d6dff641c36553e5fa -SIZE (llvm-mirror-llvm-9.0.d20190118-5570b0702238f61773d973fe6b8163c535dce2fb_GH0.tar.gz) = 45954312 -SHA256 (llvm-mirror-clang-87155c67f399837e1875acd5658a8ff76c3f3164_GH0.tar.gz) = 9b3b40f3af59f8552561e9f6da31943133c67a5beec41307515054cd2f1c966e -SIZE (llvm-mirror-clang-87155c67f399837e1875acd5658a8ff76c3f3164_GH0.tar.gz) = 18070353 -SHA256 (llvm-mirror-compiler-rt-205e34f422a7d170d8a1e53c2cfe6f38e7ea8659_GH0.tar.gz) = 65990ec0cbc58ac0199a7ce9a52fd93df4262b59bf1c7ff5739f57c9ccbffb56 -SIZE (llvm-mirror-compiler-rt-205e34f422a7d170d8a1e53c2cfe6f38e7ea8659_GH0.tar.gz) = 3273195 -SHA256 (llvm-mirror-clang-tools-extra-9e454c861c254debad1a0cbac9a56f8d6f84d058_GH0.tar.gz) = 75a63231dff7b3b89dc4bd9da2b39ce0b43c6d58b8cf373bb97aa221ef163d7f -SIZE (llvm-mirror-clang-tools-extra-9e454c861c254debad1a0cbac9a56f8d6f84d058_GH0.tar.gz) = 1416456 -SHA256 (llvm-mirror-lld-0a0e0cb4cce9d95873248788de7ba620b6918236_GH0.tar.gz) = 64d9049c5feb83838b1e01eed8630ee12c0229420d44e23b2141ee84c990b680 -SIZE (llvm-mirror-lld-0a0e0cb4cce9d95873248788de7ba620b6918236_GH0.tar.gz) = 1388289 -SHA256 (llvm-mirror-lldb-f031f20ae94286eba6274f7019db47872af033fd_GH0.tar.gz) = 1b3144d9ca3eb3556c25dd991d1f930e955812d4b7e7aca416fd0301d432cdac -SIZE (llvm-mirror-lldb-f031f20ae94286eba6274f7019db47872af033fd_GH0.tar.gz) = 24665858 -SHA256 (llvm-mirror-openmp-e223da31a44825cd907ed89306d8bcf3313b3180_GH0.tar.gz) = 0f0a4256b3f5d38e261833e26c2121c5214188abf50fc42075875cfd32de7720 -SIZE (llvm-mirror-openmp-e223da31a44825cd907ed89306d8bcf3313b3180_GH0.tar.gz) = 1479385 +TIMESTAMP = 1548117256 +SHA256 (llvm-mirror-llvm-9.0.d20190122-4b96e4b486d2a92e8f7820f6efa2c2aa0023bb66_GH0.tar.gz) = 38af1c73fa3c12819ec2e2f32029724aa934cb7fb2ff9e9eb0e80d938b10d5ff +SIZE (llvm-mirror-llvm-9.0.d20190122-4b96e4b486d2a92e8f7820f6efa2c2aa0023bb66_GH0.tar.gz) = 46030490 +SHA256 (llvm-mirror-clang-7f77c0c9a77506be62cd0c96fbfc1c0c8b3d5220_GH0.tar.gz) = 3531e0602de9d4b3ef56b45da32a7b4271d4f68fa751faa60bc243d1c1901e30 +SIZE (llvm-mirror-clang-7f77c0c9a77506be62cd0c96fbfc1c0c8b3d5220_GH0.tar.gz) = 18095756 +SHA256 (llvm-mirror-compiler-rt-225c642c81174798d0af44148018faa0022ef056_GH0.tar.gz) = 878de1bd743028c6affab1a030a4408145a15dc5dd2e2fc03bf4a4de3768e1a7 +SIZE (llvm-mirror-compiler-rt-225c642c81174798d0af44148018faa0022ef056_GH0.tar.gz) = 3280771 +SHA256 (llvm-mirror-clang-tools-extra-10ead75b2238df9e3ddb19dc73431a57cb0ffb66_GH0.tar.gz) = e212a767cf6d6640b40ce87b5f94e7c0962e9c91cc93cd6c1ba15746131bf6cf +SIZE (llvm-mirror-clang-tools-extra-10ead75b2238df9e3ddb19dc73431a57cb0ffb66_GH0.tar.gz) = 1426040 +SHA256 (llvm-mirror-lld-e4443d35d929f53a03dcfb72283c53c5fe549d23_GH0.tar.gz) = 85154d769818aa7dbb2797099810bd8ec34d3c4f4f86cb7f1fee084ec9946235 +SIZE (llvm-mirror-lld-e4443d35d929f53a03dcfb72283c53c5fe549d23_GH0.tar.gz) = 1392709 +SHA256 (llvm-mirror-lldb-e29cec1fb4a359e5ac39bc472ad2e48aa4a97229_GH0.tar.gz) = ce236fc8de0b4cf7c11176396787ed7a89442a1281f56a63f30ecdcf8446bb2c +SIZE (llvm-mirror-lldb-e29cec1fb4a359e5ac39bc472ad2e48aa4a97229_GH0.tar.gz) = 24675546 +SHA256 (llvm-mirror-openmp-c1fe93aaa489a8e621016755bf5269602ab54d8d_GH0.tar.gz) = 4cb9a819088cf5df2f43559c95855f18ca523d4070bf2cb4ebeb88f5e20bec0c +SIZE (llvm-mirror-openmp-c1fe93aaa489a8e621016755bf5269602ab54d8d_GH0.tar.gz) = 1484607 Index: head/devel/llvm-devel/files/compiler-rt-safestack_platform.h =================================================================== --- head/devel/llvm-devel/files/compiler-rt-safestack_platform.h (revision 491520) +++ head/devel/llvm-devel/files/compiler-rt-safestack_platform.h (nonexistent) @@ -1,13 +0,0 @@ ---- lib/safestack/safestack_platform.h.orig 2019-01-18 22:19:46.188728000 +0000 -+++ lib/safestack/safestack_platform.h 2019-01-18 22:14:46.776765000 +0000 -@@ -20,6 +20,10 @@ - #include - #include - -+#if SANITIZER_FREEBSD -+#include -+#endif -+ - namespace safestack { - - inline pid_t GetTid() { Property changes on: head/devel/llvm-devel/files/compiler-rt-safestack_platform.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property