From 31fbbcd101500ce672090a331feee9c3c6bf765c Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Sat, 13 Mar 2021 18:12:31 +1100 Subject: [PATCH] llvm11: update to 11.1.0. Also clean up template. --- srcpkgs/llvm11/template | 120 ++++++++++++---------------------------- srcpkgs/llvm11/update | 5 +- 2 files changed, 38 insertions(+), 87 deletions(-) diff --git a/srcpkgs/llvm11/template b/srcpkgs/llvm11/template index 12ecb4bdc4c..67546f238e4 100644 --- a/srcpkgs/llvm11/template +++ b/srcpkgs/llvm11/template @@ -1,18 +1,23 @@ # Template file for 'llvm11' pkgname=llvm11 -version=11.0.0 +version=11.1.0 revision=1 -wrksrc="llvm-${version}.src" +wrksrc="llvm-project-${version}.src" +build_wrksrc=llvm build_style=cmake configure_args=" - -DCMAKE_BUILD_TYPE=Release + -DENABLE_LINKER_BUILD_ID=ON + -DLLDB_USE_SYSTEM_SIX=ON -DLLVM_INSTALL_UTILS=ON + -DLLVM_BUILD_DOCS=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_ENABLE_FFI=ON -DLLVM_BINUTILS_INCDIR=/usr/include" -hostmakedepends="groff perl python3 zlib-devel libffi-devel swig" +# TODO: configure_args+=" -DLLVM_ENABLE_SPHINX=ON" +_projects="clang clang-tools-extra compiler-rt lld lldb" +hostmakedepends="groff perl python3 python3-Sphinx zlib-devel libffi-devel swig" makedepends="python3-devel zlib-devel libffi-devel libedit-devel libxml2-devel binutils-devel libatomic-devel" depends="libllvm11" @@ -20,20 +25,8 @@ short_desc="Low Level Virtual Machine" maintainer="q66 " license="NCSA" homepage="https://www.llvm.org" -distfiles=" - https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-${version}.src.tar.xz - https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/lldb-${version}.src.tar.xz - https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/lld-${version}.src.tar.xz - https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/clang-${version}.src.tar.xz - https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/clang-tools-extra-${version}.src.tar.xz - https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/compiler-rt-${version}.src.tar.xz" -checksum=" - 913f68c898dfb4a03b397c5e11c6a2f39d0f22ed7665c9cefa87a34423a72469 - 8570c09f57399e21e0eea0dcd66ae0231d47eafc7a04d6fe5c4951b13c4d2c72 - efe7be4a7b7cdc6f3bcf222827c6f837439e6e656d12d6c885d5c8a80ff4fd1c - 0f96acace1e8326b39f220ba19e055ba99b0ab21c2475042dbc6a482649c5209 - fed318f75d560d0e0ae728e2fb8abce71e9d0c60dd120c9baac118522ce76c09 - 374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234" +distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-project-${version}.src.tar.xz" +checksum="74d2529159fd118c3eac6f90107b5611bccc6f647fdea104024183e8d5e25831" lib32disabled=yes python_version=3 @@ -55,80 +48,39 @@ if [ "$_lldb_enable" = "yes" ]; then fi subpackages+=" lld lld-devel" -post_patch() { - # patches - cd ${XBPS_BUILDDIR}/llvm-${version}.src - for i in ${FILESDIR}/patches/llvm/llvm-*.patch; do - msg_normal "Applying $i to llvm\n" - patch -sNp1 -i ${i} - done +_apply_patches() { + local project=$1 - cd ${XBPS_BUILDDIR}/clang-${version}.src - for i in ${FILESDIR}/patches/clang/clang-*.patch; do - msg_normal "Applying $i to clang\n" - patch -sNp1 -i ${i} + for i in ${FILESDIR}/patches/${project}/*.patch; do + msg_normal "Applying ${i/${FILESDIR}\//} to ${project}\n" + patch -sNp1 -d ${wrksrc}/${project} -i ${i} done +} - cd ${XBPS_BUILDDIR}/lld-${version}.src - for i in ${FILESDIR}/patches/lld/lld-*.patch; do - msg_normal "Applying $i to lld\n" - patch -sNp1 -i ${i} +post_patch() { + for project in llvm clang lld lldb; do + _apply_patches ${project} done case "$XBPS_TARGET_MACHINE" in armv5*) - cd ${XBPS_BUILDDIR}/compiler-rt-${version}.src - for i in ${FILESDIR}/patches/compiler-rt/compiler-rt-*.patch; do - msg_normal "Applying $i to compiler-rt\n" - patch -sNp1 -i ${i} - done - ;; + _apply_patches compiler-rt ;; esac - if [ "$_lldb_enable" = "yes" ]; then - cd ${XBPS_BUILDDIR}/lldb-${version}.src - for i in ${FILESDIR}/patches/lldb/*.patch; do - msg_normal "Applying $i to lldb\n" - patch -sNp1 -i ${i} - done - case "$XBPS_TARGET_MACHINE" in - *-musl) sed -i 's|__ptrace_request|int|g' source/Plugins/Process/Linux/NativeProcessLinux.cpp ;; - esac - fi + case "$XBPS_TARGET_MACHINE" in + *-musl) sed -i 's|__ptrace_request|int|g' ${wrksrc}/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp + ;; + esac - # Move clang files into the llvm source. - if [ -d ${XBPS_BUILDDIR}/clang-${version}.src ]; then - mv ${XBPS_BUILDDIR}/clang-${version}.src ${wrksrc}/tools/clang - fi - # Move clang-tools-extra files into llvm source. - if [ -d ${XBPS_BUILDDIR}/clang-tools-extra-${version}.src ]; then - mv ${XBPS_BUILDDIR}/clang-tools-extra-${version}.src ${wrksrc}/tools/clang/tools/extra - fi - # Move lld files into the llvm source. - if [ -d ${XBPS_BUILDDIR}/lld-${version}.src ]; then - mv ${XBPS_BUILDDIR}/lld-${version}.src ${wrksrc}/tools/lld - fi - # Move lldb files into the llvm source. - if [ -d ${XBPS_BUILDDIR}/lldb-${version}.src ]; then - if [ "$_lldb_enable" = "yes" ]; then - mv ${XBPS_BUILDDIR}/lldb-${version}.src ${wrksrc}/tools/lldb - else - rm -rf ${XBPS_BUILDDIR}/lldb-${version}.src - fi - fi - # Move compiler-rt files into the llvm source. - if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version}.src ]; then - mv ${XBPS_BUILDDIR}/compiler-rt-${version}.src ${wrksrc}/projects/compiler-rt - fi case "$XBPS_TARGET_MACHINE" in *-musl) # Disable sanitizers - sed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' ${wrksrc}/projects/compiler-rt/cmake/config-ix.cmake + sed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' ${wrksrc}/compiler-rt/cmake/config-ix.cmake ;; esac # update config.guess for better platform detection - cp $XBPS_COMMONDIR/environment/configure/automake/config.guess ${wrksrc}/cmake + cp $XBPS_COMMONDIR/environment/configure/automake/config.guess ${wrksrc}/llvm/cmake } pre_configure() { @@ -145,16 +97,19 @@ pre_configure() { if [ "$CROSS_BUILD" ]; then msg_normal "Building host tblgen\n" - mkdir -p build/HOST - cd build/HOST + mkdir -p build/HOST && pushd build/HOST CC="$BUILD_CC" CXX="$BUILD_CXX" CFLAGS="$BUILD_CFLAGS" \ CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \ - cmake ../.. -DCMAKE_BUILD_TYPE=Release + cmake ../.. -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS=clang make ${makejobs} -C utils/TableGen make ${makejobs} -C tools/clang/utils/TableGen configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/build/HOST/bin/llvm-tblgen" configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/build/HOST/bin/clang-tblgen" - cd ../.. + popd + fi + + if [ "$_lldb_enable" != "yes" ]; then + _projects=${_projects/lldb/} fi case "$XBPS_TARGET_MACHINE" in @@ -169,7 +124,7 @@ pre_configure() { esac configure_args+=" -DLLVM_TARGET_ARCH=${_arch}" configure_args+=" -DLLVM_HOST_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}" - configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}" + configure_args+=" -DLLVM_ENABLE_PROJECTS=${_projects// /\;}" } do_install() { @@ -178,9 +133,6 @@ do_install() { cd build cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P cmake_install.cmake - # Fix permissions of static libs - chmod -x ${DESTDIR}/usr/lib/*.a - # Required for multilib. if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then for _header in llvm-config; do @@ -298,8 +250,6 @@ lldb_package() { vmove usr/bin/*lldb* vmove usr/lib/liblldb*so.* vmove /usr/lib/python* - # Depend on python3-six instead of conflicting - rm ${PKGDESTDIR}/usr/lib/python3*/site-packages/six.py } } diff --git a/srcpkgs/llvm11/update b/srcpkgs/llvm11/update index 3d09eaff373..e95cf26b358 100644 --- a/srcpkgs/llvm11/update +++ b/srcpkgs/llvm11/update @@ -1,2 +1,3 @@ -site=https://releases.llvm.org/ -pattern="'\K[\d\.]*(?=')" +site="https://github.com/llvm/llvm-project/releases" +pattern="llvmorg-\K(\d+.){2}\d+(-rc\d+)?" +ignore="*-rc*"