Mercurial > vanilla
changeset 649:c4039d2948b6
vanilla: upgrade LLVM toolchain to 8.0.1
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sat, 27 Jul 2019 23:11:09 +0200 |
parents | e7bebea8c0eb |
children | f61d5c5b71be |
files | dev/clang/clang.sh dev/clang/clang.sha1 dev/lld/lld.sh dev/lld/lld.sha1 dev/lldb/lldb.sh dev/llvm/llvm.sh dev/llvm/llvm.sha1 lib/compiler-rt/compiler-rt.sh lib/compiler-rt/compiler-rt.sha1 lib/libc++/libc++.sh lib/libc++/libc++.sha1 lib/libc++abi/libc++abi.sh lib/libc++abi/libc++abi.sha1 lib/libunwind/libunwind.sh lib/libunwind/libunwind.sha1 lib/openmp/openmp.sh lib/openmp/openmp.sha1 |
diffstat | 17 files changed, 79 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/dev/clang/clang.sh Sat Jul 27 14:06:29 2019 +0200 +++ b/dev/clang/clang.sh Sat Jul 27 23:11:09 2019 +0200 @@ -16,12 +16,12 @@ # PKGNAME=clang -PKGVERSION=8.0.0 +PKGVERSION=8.0.1 PKGREVISION=1 PKGLICENSE="MIT CUSTOM" PKGSUMMARY="C language family frontend for LLVM" -PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/cfe-$PKGVERSION.src.tar.xz - http://releases.llvm.org/$PKGVERSION/clang-tools-extra-$PKGVERSION.src.tar.xz" +PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/cfe-$PKGVERSION.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/clang-tools-extra-$PKGVERSION.src.tar.xz" PKGDEPENDS="dev/cmake:build" PKGOPTIONS="COMPILER_RT LIBCXX LLD TOOLS"
--- a/dev/clang/clang.sha1 Sat Jul 27 14:06:29 2019 +0200 +++ b/dev/clang/clang.sha1 Sat Jul 27 23:11:09 2019 +0200 @@ -1,2 +1,2 @@ -f341ba17494ba756fd404b2744e6f5991b50389f clang-tools-extra-8.0.0.src.tar.xz -3cb1e10af3955174a3ca5e560f674f24fac2a02f cfe-8.0.0.src.tar.xz +0174e060781fc01e5f97f2ff9b51a03165d7b37a clang-tools-extra-8.0.1.src.tar.xz +e1d7f274c4fd623f19255cc52c6d7b39cf8769ee cfe-8.0.1.src.tar.xz
--- a/dev/lld/lld.sh Sat Jul 27 14:06:29 2019 +0200 +++ b/dev/lld/lld.sh Sat Jul 27 23:11:09 2019 +0200 @@ -16,11 +16,11 @@ # PKGNAME=lld -PKGVERSION=8.0.0 +PKGVERSION=8.0.1 PKGREVISION=1 PKGLICENSE="MIT CUSTOM" PKGSUMMARY="LLVM's linker" -PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" +PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" PKGDEPENDS="dev/cmake:build" : ${CC:=clang}
--- a/dev/lld/lld.sha1 Sat Jul 27 14:06:29 2019 +0200 +++ b/dev/lld/lld.sha1 Sat Jul 27 23:11:09 2019 +0200 @@ -1,1 +1,1 @@ -b9062249ef61316e3450fc26e7238432673036bb lld-8.0.0.src.tar.xz +67d84c054c8b858d29389aa8ad47a25f632e4a3a lld-8.0.1.src.tar.xz
--- a/dev/lldb/lldb.sh Sat Jul 27 14:06:29 2019 +0200 +++ b/dev/lldb/lldb.sh Sat Jul 27 23:11:09 2019 +0200 @@ -16,11 +16,11 @@ # PKGNAME=lldb -PKGVERSION=8.0.0 +PKGVERSION=8.0.1 PKGREVISION=1 PKGLICENSE="MIT CUSTOM" PKGSUMMARY="LLVM debugger" -PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" +PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" PKGDEPENDS="dev/cmake:build dev/swig:build lib/libffi" : ${CC:=clang}
--- a/dev/llvm/llvm.sh Sat Jul 27 14:06:29 2019 +0200 +++ b/dev/llvm/llvm.sh Sat Jul 27 23:11:09 2019 +0200 @@ -16,13 +16,13 @@ # PKGNAME=llvm -PKGVERSION=8.0.0 +PKGVERSION=8.0.1 PKGREVISION=1 PKGLICENSE="MIT CUSTOM" PKGSUMMARY="low level virtual machine compiler infrastructure" -PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" -PKGDEPENDS="python/python compression/zlib dev/cmake:build" -PKGOPTIONS="DOXYGEN LIBCXX LLD SPHINX TARGETS" +PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" +PKGDEPENDS="lib/ncurses python/python compression/zlib dev/cmake:build" +PKGOPTIONS="DOXYGEN LIBCXX LLD SPHINX STATIC TARGETS" : ${CHOST:=$(uname -m)-linux-musl} : ${CC:=clang} @@ -33,6 +33,7 @@ : ${LIBCXX:=yes} : ${LLD:=yes} : ${SPHINX:=yes} +: ${STATIC:=no} : ${TARGETS:=all} if [ "$LIBCXX" = "yes" ]; then @@ -61,6 +62,12 @@ with_sphinx="-DLLVM_ENABLE_SPHINX=Off" fi +if [ "$STATIC" = "yes" ]; then + with_static="-DLLVM_BUILD_LLVM_DYLIB=Off -DLLVM_LINK_LLVM_DYLIB=Off" +else + with_static="-DLLVM_BUILD_LLVM_DYLIB=On -DLLVM_LINK_LLVM_DYLIB=On" +fi + build() { rm -rf $PKGNAME-$PKGVERSION.src @@ -79,12 +86,11 @@ -DLLVM_ENABLE_RTTI=On \ -DLLVM_HOST_TRIPLE=$CHOST \ -DLLVM_TARGETS_TO_BUILD=$TARGETS \ - -DLLVM_BUILD_LLVM_DYLIB=On \ - -DLLVM_LINK_LLVM_DYLIB=On \ $with_doxygen \ $with_libcxx \ $with_lld \ - $with_sphinx + $with_sphinx \ + $with_static make make DESTDIR=$DESTDIR install cd ..
--- a/dev/llvm/llvm.sha1 Sat Jul 27 14:06:29 2019 +0200 +++ b/dev/llvm/llvm.sha1 Sat Jul 27 23:11:09 2019 +0200 @@ -1,1 +1,1 @@ -0689345d73911e24a07b24cc82dab4fb46b8c323 llvm-8.0.0.src.tar.xz +09964f9eabc364f221a3caefbdaea28557273b4a llvm-8.0.1.src.tar.xz
--- a/lib/compiler-rt/compiler-rt.sh Sat Jul 27 14:06:29 2019 +0200 +++ b/lib/compiler-rt/compiler-rt.sh Sat Jul 27 23:11:09 2019 +0200 @@ -16,11 +16,11 @@ # PKGNAME=compiler-rt -PKGVERSION=8.0.0 +PKGVERSION=8.0.1 PKGREVISION=1 PKGLICENSE="MIT CUSTOM" PKGSUMMARY="compiler-rt runtime libraries" -PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" +PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" : ${CC:=clang} : ${CFLAGS:=-O2}
--- a/lib/compiler-rt/compiler-rt.sha1 Sat Jul 27 14:06:29 2019 +0200 +++ b/lib/compiler-rt/compiler-rt.sha1 Sat Jul 27 23:11:09 2019 +0200 @@ -1,1 +1,1 @@ -5af387779120bb2a9fad5d6fff1a3d6f4fa6c352 compiler-rt-8.0.0.src.tar.xz +f6520fb47fae9cc4362a9d50abee22019c27457a compiler-rt-8.0.1.src.tar.xz
--- a/lib/libc++/libc++.sh Sat Jul 27 14:06:29 2019 +0200 +++ b/lib/libc++/libc++.sh Sat Jul 27 23:11:09 2019 +0200 @@ -16,12 +16,12 @@ # PKGNAME=libc++ -PKGVERSION=8.0.0 +PKGVERSION=8.0.1 PKGREVISION=1 PKGLICENSE="MIT CUSTOM" PKGSUMMARY="C++ standard library from LLVM" -PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/libcxx-$PKGVERSION.src.tar.xz" -PKGOPTIONS="ABI COMPILER_RT LIBUNWIND" +PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/libcxx-$PKGVERSION.src.tar.xz" +PKGOPTIONS="ABI COMPILER_RT LIBUNWIND STATIC" : ${CC:=clang} : ${CFLAGS:=-O2} @@ -30,6 +30,7 @@ : ${ABI:=libcxxabi} : ${COMPILER_RT:=yes} : ${LIBUNWIND:=yes} +: ${STATIC:=no} if [ "$COMPILER_RT" = "yes" ]; then with_compiler_rt="-DLIBCXX_USE_COMPILER_RT=On" @@ -43,6 +44,12 @@ with_libunwind="-DLIBCXXABI_USE_LLVM_UNWINDER=Off" fi +if [ "$STATIC" = "yes" ]; then + with_static="-DLIBCXX_ENABLE_SHARED=Off" +else + with_static="-DLIBCXX_ENABLE_SHARED=On" +fi + build() { rm -rf libcxx-$PKGVERSION.src @@ -51,7 +58,6 @@ mkdir build && cd build cmake .. \ - -DBUILD_SHARED_LIBS=On \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_COMPILER="$CXX" \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ @@ -61,7 +67,8 @@ -DLIBCXX_CXX_ABI=$ABI \ -DLIBCXX_HAS_MUSL_LIBC=On \ $with_compiler_rt \ - $with_libunwind + $with_libunwind \ + $with_static make make install DESTDIR=$DESTDIR cd ..
--- a/lib/libc++/libc++.sha1 Sat Jul 27 14:06:29 2019 +0200 +++ b/lib/libc++/libc++.sha1 Sat Jul 27 23:11:09 2019 +0200 @@ -1,1 +1,1 @@ -ad384693ec4ec8ef7875755e09242418170eb114 libcxx-8.0.0.src.tar.xz +4aeec12226a98d438d600cd0e0a76975419989a0 libcxx-8.0.1.src.tar.xz
--- a/lib/libc++abi/libc++abi.sh Sat Jul 27 14:06:29 2019 +0200 +++ b/lib/libc++abi/libc++abi.sh Sat Jul 27 23:11:09 2019 +0200 @@ -16,12 +16,12 @@ # PKGNAME=libc++abi -PKGVERSION=8.0.0 +PKGVERSION=8.0.1 PKGREVISION=1 PKGLICENSE="MIT CUSTOM" PKGSUMMARY="low level support for the standard C++ library" -PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/libcxxabi-$PKGVERSION.src.tar.xz" -PKGOPTIONS="COMPILER_RT LIBUNWIND" +PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/libcxxabi-$PKGVERSION.src.tar.xz" +PKGOPTIONS="COMPILER_RT LIBUNWIND STATIC" : ${CC:=clang} : ${CFLAGS:=-O2} @@ -29,6 +29,7 @@ : ${CXXFLAGS:=-O2} : ${COMPILER_RT:=yes} : ${LIBUNWIND:=yes} +: ${STATIC:=no} if [ "$COMPILER_RT" = "yes" ]; then with_compiler_rt="-DLIBCXXABI_USE_COMPILER_RT=Off" @@ -42,6 +43,12 @@ with_libunwind="-DLIBCXXABI_USE_LLVM_UNWINDER=Off" fi +if [ "$STATIC" = "yes" ]; then + with_static="-DLIBCXXABI_ENABLE_SHARED=Off" +else + with_static="-DLIBCXXABI_ENABLE_SHARED=On" +fi + build() { rm -rf libcxxabi-$PKGVERSION.src @@ -50,7 +57,6 @@ mkdir build && cd build cmake .. \ - -DBUILD_SHARED_LIBS=On \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_COMPILER="$CXX" \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ @@ -59,7 +65,8 @@ -DCMAKE_INSTALL_PREFIX= \ -DLIBCXXABI_LIBCXX_INCLUDES=/include/c++/v1 \ $with_compiler_rt \ - $with_libunwind + $with_libunwind \ + $with_static make make install DESTDIR=$DESTDIR mkdir -p $DESTDIR/include
--- a/lib/libc++abi/libc++abi.sha1 Sat Jul 27 14:06:29 2019 +0200 +++ b/lib/libc++abi/libc++abi.sha1 Sat Jul 27 23:11:09 2019 +0200 @@ -1,1 +1,1 @@ -735c6daeb489c2e02a1cedcf045d70a35d7ee026 libcxxabi-8.0.0.src.tar.xz +7834b58ad0e7adb5229342a8daa08ef1d29a8b13 libcxxabi-8.0.1.src.tar.xz
--- a/lib/libunwind/libunwind.sh Sat Jul 27 14:06:29 2019 +0200 +++ b/lib/libunwind/libunwind.sh Sat Jul 27 23:11:09 2019 +0200 @@ -16,16 +16,24 @@ # PKGNAME=libunwind -PKGVERSION=8.0.0 +PKGVERSION=8.0.1 PKGREVISION=1 PKGLICENSE="MIT CUSTOM" PKGSUMMARY="LLVM's unwinder" -PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" +PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" +PKGOPTIONS="STATIC" : ${CC:=clang} : ${CFLAGS:=-O2} : ${CXX:=clang++} : ${CXXFLAGS:=-O2} +: ${STATIC:=no} + +if [ "$STATIC" = "yes" ]; then + with_static="-DLIBUNWIND_ENABLE_SHARED=Off" +else + with_static="-DLIBUNWIND_ENABLE_SHARED=On" +fi build() { @@ -35,14 +43,14 @@ mkdir build && cd build cmake .. \ - -DBUILD_SHARED_LIBS=On \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_COMPILER="$CXX" \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_INSTALL_PREFIX= \ - -DLIBUNWIND_USE_COMPILER_RT=On + -DLIBUNWIND_USE_COMPILER_RT=On \ + $with_static make make install DESTDIR=$DESTDIR mkdir -p $DESTDIR/include
--- a/lib/libunwind/libunwind.sha1 Sat Jul 27 14:06:29 2019 +0200 +++ b/lib/libunwind/libunwind.sha1 Sat Jul 27 23:11:09 2019 +0200 @@ -1,1 +1,1 @@ -b34682d855c42ae77ada8e9b62af133386855412 libunwind-8.0.0.src.tar.xz +6aebc6eaa54408138143ace8b5745301981883c8 libunwind-8.0.1.src.tar.xz
--- a/lib/openmp/openmp.sh Sat Jul 27 14:06:29 2019 +0200 +++ b/lib/openmp/openmp.sh Sat Jul 27 23:11:09 2019 +0200 @@ -16,16 +16,24 @@ # PKGNAME=openmp -PKGVERSION=8.0.0 +PKGVERSION=8.0.1 PKGREVISION=1 PKGLICENSE="CUSTOM" PKGSUMMARY="OpenMP implementation from LLVM" -PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" +PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" +PKGOPTIONS="STATIC" : ${CC:=clang} : ${CFLAGS:=-O2} : ${CXX:=clang++} : ${CXXFLAGS:=-O2} +: ${STATIC:=no} + +if [ "$STATIC" = "yes" ]; then + with_static="-DLIBOMP_ENABLE_SHARED=Off" +else + with_static="-DLIBOMP_ENABLE_SHARED=On" +fi build() { @@ -40,7 +48,8 @@ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_INSTALL_PREFIX= + -DCMAKE_INSTALL_PREFIX= \ + $with_static make make install DESTDIR=$DESTDIR cd ..