FreeBSD Bugzilla – Attachment 177073 Details for
Bug 212334
devel/llvm-devel: Improve port (v4.0.d20161115)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch (since 426205 revision)
llvm-devel.diff (text/plain), 26.16 KB, created by
lightside
on 2016-11-16 13:06:15 UTC
(
hide
)
Description:
Proposed patch (since 426205 revision)
Filename:
MIME Type:
Creator:
lightside
Created:
2016-11-16 13:06:15 UTC
Size:
26.16 KB
patch
obsolete
>diff -ruN llvm-devel.orig/Makefile llvm-devel/Makefile >--- llvm-devel.orig/Makefile 2016-11-16 04:52:01.000000000 +0400 >+++ llvm-devel/Makefile 2016-11-16 15:20:50.901763000 +0400 >@@ -3,12 +3,18 @@ > > PORTNAME= llvm > PORTVERSION= ${LLVM_MAJOR}.d${SNAPDATE} >+PORTREVISION= 1 > CATEGORIES= devel lang > PKGNAMESUFFIX= -devel > > MAINTAINER= brooks@FreeBSD.org > COMMENT= LLVM and Clang > >+LICENSE= LLVM >+LICENSE_NAME= LLVM Release License >+LICENSE_FILE= ${WRKSRC}/LICENSE.TXT >+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept >+ > BROKEN_powerpc64= Does not build > > LLVM_SUFFIX= -devel >@@ -16,6 +22,9 @@ > DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} > DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} > >+TEST_TARGET= check >+TEST_WRKSRC= ${BUILD_WRKSRC} >+ > USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 > USE_LDCONFIG= ${LLVM_PREFIX}/lib > _USES_PYTHON?= python:build >@@ -27,16 +36,18 @@ > CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} > CMAKE_ARGS= -DLLVM_BUILD_LLVM_DYLIB=ON > >+PORTDOCS= * >+ > USE_GITHUB= yes > GH_ACCOUNT= llvm-mirror > GH_TAGNAME= ${LLVM_COMMIT} > > .include "Makefile.snapshot" > >-OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB >+OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB UTILS > OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP > OPTIONS_DEFINE_i386= COMPILER_RT >-OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD LLDB >+OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD LLDB UTILS > OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP > OPTIONS_DEFAULT_i386= COMPILER_RT > OPTIONS_SUB= yes >@@ -44,7 +55,7 @@ > PLIST_FILES= > > CLANG_DESC= Build clang >-CLANG_EXTRA_PATCHES= \ >+CLANG_EXTRA_PATCHES= \ > ${PATCHDIR}/clang-patch-fformat_extensions.diff \ > ${PATCHDIR}/clang-patch-fopenmp.diff \ > ${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt >@@ -53,14 +64,14 @@ > 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_SUBDIR= projects/compiler-rt:compiler_rt > COMPILER_RT_GH_TAGNAME= ${COMPILER_RT_COMMIT}:compiler_rt >-COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} >-DOCS_PORTDOCS= llvm >+COMPILER_RT_PLIST_FILES= ${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR_PREFIX}/|} >+DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx > DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ > -DSPHINX_WARNINGS_AS_ERRORS=OFF \ > -DLLVM_BUILD_DOCS=ON >@@ -70,8 +81,15 @@ > 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 >-LLDB_VARS= _USES_PYTHON=python >+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 >+LIT_DESC= Install lit testing tool >+LIT_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} >+LIT_IMPLIES= UTILS >+LIT_SUB_FILES= llvm-lit-wrapper.sh >+LIT_SUB_LIST= LLVM_PYTHON_SITELIBDIR="${PYTHONPREFIX_SITELIBDIR:S|^${PREFIX}||}" >+LIT_VARS= _USES_PYTHON=python > LLD_DESC= Install lld, the LLVM linker > LLD_GH_PROJECT= lld:lld > LLD_GH_SUBDIR= tools/lld:lld >@@ -88,13 +106,8 @@ > OPENMP_GH_PROJECT= openmp:openmp > OPENMP_GH_SUBDIR= tools/openmp:openmp > OPENMP_GH_TAGNAME= ${OPENMP_COMMIT}: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 >- >-OPTIONS_SUB= yes >- >-DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx >+UTILS_DESC= Install utility binaries >+UTILS_CMAKE_ON= -DLLVM_INSTALL_UTILS=ON > > PLIST_SUB+= LLVM_MAJOR=${LLVM_MAJOR} LLVM_RELEASE=${LLVM_RELEASE} > >@@ -127,7 +140,7 @@ > llvm-strings \ > llvm-symbolizer \ > llvm-tblgen \ >- macho-dump \ >+ llvm-xray \ > opt \ > sancov > FIRST_COMMAND= ${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} >@@ -137,11 +150,10 @@ > ${LIBNAME}.0 \ > libLTO.so > >-EXTRAS_COMMANDS= \ >+EXTRAS_COMMANDS= \ > clang-apply-replacements \ > clang-change-namespace \ > clang-include-fixer \ >- clang-modernize \ > clang-query \ > clang-rename \ > clang-reorder-fields \ >@@ -184,9 +196,28 @@ > COMPILER_RT_PATTERN= (asan_blacklist.txt|sanitizer|xray_interface.h) > .endif > >+LIT_COMMANDS= lit llvm-lit >+FIRST_LIT_COMMAND= ${LIT_COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} >+ > .if ${PORT_OPTIONS:MLIT} >-MAN1SRCS+= lit.1 FileCheck.1 >-LIT_COMMANDS= lit llvm-lit FileCheck >+MAN1SRCS+= lit.1 >+.endif >+ >+UTILS_COMMANDS= count \ >+ FileCheck \ >+ lli-child-target \ >+ llvm-PerfectShuffle \ >+ not \ >+ yaml-bench >+CLANG_UTILS_COMMANDS= clang-tblgen >+UTILS_PATTERN= ${UTILS_COMMANDS:tW:C/ */|/g}|${CLANG_UTILS_COMMANDS:tW:C/ */|/g} >+ >+.if ${PORT_OPTIONS:MUTILS} >+COMMANDS+= ${UTILS_COMMANDS} >+.if ${PORT_OPTIONS:MCLANG} >+COMMANDS+= ${CLANG_UTILS_COMMANDS} >+.endif >+MAN1SRCS+= FileCheck.1 > .endif > > .if ${PORT_OPTIONS:MLLDB} >@@ -225,9 +256,10 @@ > > .include <bsd.port.pre.mk> > >-_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/freebsd >+_CRTLIBDIR= /lib/clang/${LLVM_RELEASE}/lib/${OPSYS:tl} >+_CRTLIBDIR_PREFIX= ${LLVM_PREFIX:S|${PREFIX}/||}${_CRTLIBDIR} > .if ${ARCH} == "amd64" >-_COMPILER_RT_LIBS= \ >+_COMPILER_RT_LIBS= \ > libclang_rt.asan-preinit-x86_64.a \ > libclang_rt.asan-x86_64.a \ > libclang_rt.asan-x86_64.a.syms \ >@@ -252,7 +284,7 @@ > libclang_rt.ubsan_standalone_cxx-x86_64.a.syms > .endif > .if ${ARCH} == "i386" >-_COMPILER_RT_LIBS+= \ >+_COMPILER_RT_LIBS+= \ > libclang_rt.asan-i386.a \ > libclang_rt.asan-i386.so \ > libclang_rt.asan-preinit-i386.a \ >@@ -269,16 +301,14 @@ > .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 > >-.if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang >+.if ${OPSYS} == "FreeBSD" && ${CHOSEN_COMPILER_TYPE} != clang > BROKEN= Working C++11 compiler and library required > .endif > >@@ -286,36 +316,28 @@ > BROKEN= LLDB does not build with Python 3 > .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 >- >-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-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-patch-CLANG-on: >+ @${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \ >+ ${WRKSRC}/tools/clang/lib/Driver/Tools.cpp >+ >+do-install-LIT-on: >+ @(cd ${WRKSRC}/utils/lit; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ >+ ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} \ >+ --no-compile --single-version-externally-managed \ >+ --root=${STAGEDIR} --prefix=${LLVM_PREFIX}) >+ ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ >+ ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit > > 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 >+ ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1 > .endfor > .if ! ${PORT_OPTIONS:MLIT} > ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1 >+.endif >+.if ! ${PORT_OPTIONS:MUTILS} > ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1 > .endif > ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/ >@@ -330,40 +352,28 @@ > > post-install-CLANG-on: > ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ >- ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp >+ ${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* >+ ${RM} ${STAGEDIR}${LLVM_PREFIX}${_CRTLIBDIR}/libclang_rt*i386* > .endif > >-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 >+post-install-script: >+ ${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 >+.if ${PORT_OPTIONS:MLIT} >+ ${INSTALL_SCRIPT} ${WRKDIR}/llvm-lit-wrapper.sh \ >+ ${STAGEDIR}${PREFIX}/bin/${FIRST_LIT_COMMAND}${LLVM_SUFFIX} >+.for command in ${LIT_COMMANDS:C/^/XXXX/1:NXXXX*} >+ ${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_LIT_COMMAND}${LLVM_SUFFIX} \ >+ ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX} >+.endfor >+.endif > > build-plist: > ${RM} ${PLIST} ${PLIST}.tmp >@@ -375,28 +385,27 @@ > ${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|${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}/) \ >+ ${GREP} -v '[/-]lit$$' | \ >+ ${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:C/\./\\./g}|%%LLVM_RELEASE%%|' \ >+ -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \ >+ -e 's|${PYTHONPREFIX_SITELIBDIR:S|^${PREFIX}||}|/%%PYTHON_SITELIBDIR%%|' \ >+ -e 's|py${PYTHON_VER}|py%%PYTHON_VER%%|' | \ >+ ${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/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \ >- if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ >- if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ >- if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} \ >- if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \ >- if ($$0 !~ /libclang_rt/) {print} \ >+ if ($$0 ~ /PYTHON_SITELIBDIR/ && /lit/) {printf "%%%%LIT%%%%"} \ >+ if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \ >+ if ($$0 ~ /bin/ && /(${UTILS_PATTERN})/) {printf "%%%%UTILS%%%%"} \ >+ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ >+ 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 > >diff -ruN llvm-devel.orig/files/clang-patch-fopenmp.diff llvm-devel/files/clang-patch-fopenmp.diff >--- llvm-devel.orig/files/clang-patch-fopenmp.diff 2016-11-16 04:52:01.000000000 +0400 >+++ llvm-devel/files/clang-patch-fopenmp.diff 2016-11-16 15:35:35.268858000 +0400 >@@ -1,5 +1,5 @@ >---- tools/clang/lib/Driver/Tools.cpp.orig 2016-11-15 23:32:35.007899310 +0000 >-+++ tools/clang/lib/Driver/Tools.cpp 2016-11-15 23:41:11.888863662 +0000 >+--- tools/clang/lib/Driver/Tools.cpp.orig 2016-11-15 23:32:35 UTC >++++ tools/clang/lib/Driver/Tools.cpp > @@ -3151,13 +3151,22 @@ > > switch (TC.getDriver().getOpenMPRuntime(Args)) { >diff -ruN llvm-devel.orig/files/gen-Makefile.snapshot.sh llvm-devel/files/gen-Makefile.snapshot.sh >--- llvm-devel.orig/files/gen-Makefile.snapshot.sh 2016-07-26 21:23:32.000000000 +0400 >+++ llvm-devel/files/gen-Makefile.snapshot.sh 2016-09-01 15:52:28.689672000 +0400 >@@ -1,13 +1,13 @@ > #!/bin/sh > # >-# Simple script to fetch the latest commits via the github API. Requires >-# curl and jq. Uses unauthenticated access which is ratelimited to 60 >-# queries per hour. >+# Simple script to fetch the latest commits via the GitHub API. >+# Uses unauthenticated access, which is ratelimited to 60 queries per hour. > > get_repo_sha() > { >- curl https://api.github.com/repos/llvm-mirror/$1/branches/master | \ >- jq -r '.commit.sha' >+ fetch -qo - \ >+ https://api.github.com/repos/llvm-mirror/$1/git/refs/heads/master | \ >+ sed -e 's|.*commits/\(.*\)".*|\1|' > } > > cat <<EOF > Makefile.snapshot >diff -ruN llvm-devel.orig/files/llvm-lit-wrapper.sh.in llvm-devel/files/llvm-lit-wrapper.sh.in >--- llvm-devel.orig/files/llvm-lit-wrapper.sh.in 1970-01-01 03:00:00.000000000 +0300 >+++ llvm-devel/files/llvm-lit-wrapper.sh.in 2016-09-02 13:22:01.119571000 +0400 >@@ -0,0 +1,12 @@ >+#!/bin/sh >+# $FreeBSD$ >+ >+LLVM_PREFIX="%%LLVM_PREFIX%%" >+LLVM_SUFFIX="%%LLVM_SUFFIX%%" >+LLVM_PYTHON_SITELIBDIR="%%LLVM_PYTHON_SITELIBDIR%%" >+ >+tool=$(basename $0) >+tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}" >+LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \ >+PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${LLVM_PREFIX}${LLVM_PYTHON_SITELIBDIR}" \ >+ "${tool}" "${@}" >diff -ruN llvm-devel.orig/files/patch-tools_llvm-shlib_CMakeLists.txt llvm-devel/files/patch-tools_llvm-shlib_CMakeLists.txt >--- llvm-devel.orig/files/patch-tools_llvm-shlib_CMakeLists.txt 2016-11-16 04:52:01.000000000 +0400 >+++ llvm-devel/files/patch-tools_llvm-shlib_CMakeLists.txt 2016-11-16 15:28:10.371040000 +0400 >@@ -1,7 +1,7 @@ > Otherwise we end up with a 4k library without any symbols. > >---- tools/llvm-shlib/CMakeLists.txt.orig 2016-11-15 23:09:53.000000000 +0000 >-+++ tools/llvm-shlib/CMakeLists.txt 2016-11-15 23:51:35.550820927 +0000 >+--- tools/llvm-shlib/CMakeLists.txt.orig 2016-11-15 23:09:53 UTC >++++ tools/llvm-shlib/CMakeLists.txt > @@ -37,7 +37,7 @@ > add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES}) > >diff -ruN llvm-devel.orig/pkg-plist llvm-devel/pkg-plist >--- llvm-devel.orig/pkg-plist 2016-11-16 04:52:01.000000000 +0400 >+++ llvm-devel/pkg-plist 2016-11-16 15:22:57.662077000 +0400 >@@ -27,7 +27,7 @@ > bin/llvm-strings-devel > bin/llvm-symbolizer-devel > bin/llvm-tblgen-devel >-bin/macho-dump-devel >+bin/llvm-xray-devel > bin/opt-devel > bin/sancov-devel > %%CLANG%%bin/c-index-test-devel >@@ -39,6 +39,13 @@ > %%CLANG%%bin/clang-offload-bundler-devel > %%CLANG%%bin/scan-build-devel > %%CLANG%%bin/scan-view-devel >+%%UTILS%%bin/count-devel >+%%UTILS%%bin/FileCheck-devel >+%%UTILS%%bin/lli-child-target-devel >+%%UTILS%%bin/llvm-PerfectShuffle-devel >+%%UTILS%%bin/not-devel >+%%UTILS%%bin/yaml-bench-devel >+%%CLANG%%%%UTILS%%bin/clang-tblgen-devel > %%LLDB%%bin/lldb-devel > %%LLDB%%bin/lldb-argdumper-devel > %%LLDB%%bin/lldb-mi-devel >@@ -46,7 +53,6 @@ > %%EXTRAS%%bin/clang-apply-replacements-devel > %%EXTRAS%%bin/clang-change-namespace-devel > %%EXTRAS%%bin/clang-include-fixer-devel >-%%EXTRAS%%bin/clang-modernize-devel > %%EXTRAS%%bin/clang-query-devel > %%EXTRAS%%bin/clang-rename-devel > %%EXTRAS%%bin/clang-reorder-fields-devel >@@ -59,9 +65,47 @@ > %%LIT%%llvm-devel/bin/lit > %%LIT%%bin/llvm-lit-devel > %%LIT%%llvm-devel/bin/llvm-lit >-%%LIT%%bin/FileCheck-devel >-%%LIT%%llvm-devel/bin/FileCheck >-%%COMPILER_RT%%llvm-devel/asan_blacklist.txt >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit-0.6.0.dev0-py%%PYTHON_VER%%.egg-info/PKG-INFO >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit-0.6.0.dev0-py%%PYTHON_VER%%.egg-info/SOURCES.txt >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit-0.6.0.dev0-py%%PYTHON_VER%%.egg-info/dependency_links.txt >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit-0.6.0.dev0-py%%PYTHON_VER%%.egg-info/entry_points.txt >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit-0.6.0.dev0-py%%PYTHON_VER%%.egg-info/not-zip-safe >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit-0.6.0.dev0-py%%PYTHON_VER%%.egg-info/top_level.txt >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/LitConfig.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/LitTestCase.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/ProgressBar.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/ShCommands.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/ShUtil.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/Test.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/TestRunner.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/TestingConfig.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/__init__.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/discovery.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/formats/__init__.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/formats/base.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/formats/googletest.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/formats/shtest.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/main.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/run.py >+%%LIT%%llvm-devel/%%PYTHON_SITELIBDIR%%/lit/util.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/__init__.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/_lldb.so >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/embedded_interpreter.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/Logger.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/__init__.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/attrib_fromdict.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/cache.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/__init__.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/gnu_libstdcpp.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/libcxx.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/metrics.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/synth.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/lldb-argdumper >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/runtime/__init__.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/utils/__init__.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/utils/symbolication.py >+%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/six.py >+%%UTILS%%llvm-devel/bin/FileCheck > llvm-devel/bin/bugpoint > %%CLANG%%llvm-devel/bin/c-index-test > %%CLANG%%llvm-devel/bin/clang >@@ -78,7 +122,9 @@ > %%EXTRAS%%llvm-devel/bin/clang-query > %%EXTRAS%%llvm-devel/bin/clang-rename > %%EXTRAS%%llvm-devel/bin/clang-reorder-fields >+%%CLANG%%%%UTILS%%llvm-devel/bin/clang-tblgen > %%EXTRAS%%llvm-devel/bin/clang-tidy >+%%UTILS%%llvm-devel/bin/count > %%EXTRAS%%llvm-devel/bin/find-all-symbols > %%CLANG%%llvm-devel/bin/git-clang-format > %%LLD%%llvm-devel/bin/ld.lld >@@ -93,6 +139,8 @@ > %%LLDB%%llvm-devel/bin/lldb-server > %%LLDB%%llvm-devel/bin/lldb-server-%%LLVM_RELEASE%% > llvm-devel/bin/lli >+%%UTILS%%llvm-devel/bin/lli-child-target >+%%UTILS%%llvm-devel/bin/llvm-PerfectShuffle > llvm-devel/bin/llvm-ar > llvm-devel/bin/llvm-as > llvm-devel/bin/llvm-bcanalyzer >@@ -129,6 +177,7 @@ > llvm-devel/bin/llvm-tblgen > llvm-devel/bin/llvm-xray > %%EXTRAS%%llvm-devel/bin/modularize >+%%UTILS%%llvm-devel/bin/not > llvm-devel/bin/obj2yaml > llvm-devel/bin/opt > llvm-devel/bin/sancov >@@ -136,6 +185,7 @@ > %%CLANG%%llvm-devel/bin/scan-build > %%CLANG%%llvm-devel/bin/scan-view > llvm-devel/bin/verify-uselistorder >+%%UTILS%%llvm-devel/bin/yaml-bench > llvm-devel/bin/yaml2obj > %%CLANG%%llvm-devel/include/clang-c/BuildSystem.h > %%CLANG%%llvm-devel/include/clang-c/CXCompilationDatabase.h >@@ -2128,20 +2178,10 @@ > llvm-devel/include/llvm/Transforms/Vectorize.h > llvm-devel/include/llvm/Transforms/Vectorize/LoopVectorize.h > llvm-devel/include/llvm/Transforms/Vectorize/SLPVectorizer.h >-%%COMPILER_RT%%llvm-devel/include/sanitizer/allocator_interface.h >-%%COMPILER_RT%%llvm-devel/include/sanitizer/asan_interface.h >-%%COMPILER_RT%%llvm-devel/include/sanitizer/common_interface_defs.h >-%%COMPILER_RT%%llvm-devel/include/sanitizer/coverage_interface.h >-%%COMPILER_RT%%llvm-devel/include/sanitizer/dfsan_interface.h >-%%COMPILER_RT%%llvm-devel/include/sanitizer/esan_interface.h >-%%COMPILER_RT%%llvm-devel/include/sanitizer/linux_syscall_hooks.h >-%%COMPILER_RT%%llvm-devel/include/sanitizer/lsan_interface.h >-%%COMPILER_RT%%llvm-devel/include/sanitizer/msan_interface.h >-%%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface_atomic.h >-%%COMPILER_RT%%llvm-devel/include/xray/xray_interface.h > llvm-devel/lib/BugpointPasses.so > llvm-devel/lib/LLVMHello.so > %%GOLD%%llvm-devel/lib/LLVMgold.so >+%%CLANG%%%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/asan_blacklist.txt > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_builtin_vars.h > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h > %%CLANG%%%%OPENMP%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_complex_builtins.h >@@ -2210,6 +2250,16 @@ > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h >+%%CLANG%%%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/allocator_interface.h >+%%CLANG%%%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/asan_interface.h >+%%CLANG%%%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/common_interface_defs.h >+%%CLANG%%%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/coverage_interface.h >+%%CLANG%%%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/dfsan_interface.h >+%%CLANG%%%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/esan_interface.h >+%%CLANG%%%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/linux_syscall_hooks.h >+%%CLANG%%%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/lsan_interface.h >+%%CLANG%%%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/msan_interface.h >+%%CLANG%%%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/tsan_interface_atomic.h > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tbmintrin.h >@@ -2222,6 +2272,7 @@ > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/x86intrin.h > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xmmintrin.h > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xopintrin.h >+%%CLANG%%%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xray/xray_interface.h > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xsavecintrin.h > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xsaveintrin.h > %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xsaveoptintrin.h >@@ -2537,23 +2588,6 @@ > %%LLDB%%llvm-devel/lib/liblldbTarget.a > %%LLDB%%llvm-devel/lib/liblldbUtility.a > %%OPENMP%%llvm-devel/lib/libomp.so >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/__init__.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/_lldb.so >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/embedded_interpreter.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/formatters/Logger.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/formatters/__init__.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/formatters/attrib_fromdict.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/formatters/cache.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/formatters/cpp/__init__.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/formatters/cpp/gnu_libstdcpp.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/formatters/cpp/libcxx.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/formatters/metrics.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/formatters/synth.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/lldb-argdumper >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/runtime/__init__.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/utils/__init__.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/utils/symbolication.py >-%%LLDB%%llvm-devel/lib/python2.7/site-packages/six.py > %%CLANG%%llvm-devel/libexec/c++-analyzer > %%CLANG%%llvm-devel/libexec/ccc-analyzer > %%CLANG%%llvm-devel/share/clang/clang-format-bbedit.applescript >@@ -2576,16 +2610,3 @@ > %%CLANG%%llvm-devel/share/scan-view/ScanView.py > %%CLANG%%llvm-devel/share/scan-view/bugcatcher.ico > %%CLANG%%llvm-devel/share/scan-view/startfile.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitConfig.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitTestCase.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ProgressBar.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ShCommands.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ShUtil.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/Test.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/TestRunner.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/TestingConfig.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/__init__.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/discovery.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/main.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/run.py >-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/util.py
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=177073">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 212334
:
174316
|
174317
|
174318
|
174339
|
174340
|
174344
|
174348
|
175323
|
175490
|
175491
|
175493
|
175494
|
176130
|
177072
| 177073 |
177076