diff options
Diffstat (limited to 'source/d')
-rwxr-xr-x | source/d/llvm/llvm.SlackBuild | 31 | ||||
-rwxr-xr-x | source/d/rust/rust.SlackBuild | 10 | ||||
-rw-r--r-- | source/d/rust/rust.url | 6 |
3 files changed, 35 insertions, 12 deletions
diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild index 02df9eb49..0a343646f 100755 --- a/source/d/llvm/llvm.SlackBuild +++ b/source/d/llvm/llvm.SlackBuild @@ -27,7 +27,23 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=llvm VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} + +# For the two options below, either set both to OFF or *only one* to ON: + +# Build using -DBUILD_SHARED_LIBS=ON. +# While this is not the officially recommended way to build LLVM, it produces +# a smaller package and the compiler seems to be reliable when built this way. +BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:=ON} + +# Build using -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCLANG_LINK_CLANG_DYLIB=ON: +# This is the recommended way to built LLVM with shared libraries, however +# the resulting package is twice as large and also wasn't able to build +# Firefox or Thunderbird here. If you rebuild LLVM with this option, you'll +# also need to recompile spirv-llvm-translator, mesa, and possibly other +# third party packages. The resulting compiler has not been reliable here. +# I would not recommend using this option, but feel free to try it. +LLVM_BUILD_LLVM_DYLIB=${LLVM_BUILD_LLVM_DYLIB:=OFF} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -168,6 +184,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Collect shared library options. If both of the configurable options are set +# to ON, the last one we check will be the one we use. +if [ "$BUILD_SHARED_LIBS" = "ON" ]; then + SHARED_LIBRARY_OPTIONS="-DBUILD_SHARED_LIBS=ON" +fi +if [ "$LLVM_BUILD_LLVM_DYLIB" = "ON" ]; then + SHARED_LIBRARY_OPTIONS="-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCLANG_LINK_CLANG_DYLIB=ON" +fi + mkdir build cd build mkdir include @@ -183,9 +208,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLLVM_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_BUILD_LLVM_DYLIB=ON \ - -DLLVM_LINK_LLVM_DYLIB=ON \ - -DCLANG_LINK_CLANG_DYLIB=ON \ + $SHARED_LIBRARY_OPTIONS \ -DLLVM_USE_LINKER=gold \ -DLLVM_ENABLE_RTTI=ON \ -DLLVM_ENABLE_FFI=ON \ diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 8dd2553d7..5e76cffea 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -26,17 +26,17 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.61.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.62.0} +BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. # YES is probably better (when it works...) SYSTEM_LLVM=${SYSTEM_LLVM:-YES} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.60.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2022-04-07} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.60.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.61.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2022-05-19} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.61.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index ae8f914c6..ac8440fe1 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.lz): -VERSION=1.61.0 +VERSION=1.62.0 rm -f rustc-${VERSION}-src.tar.* lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz.asc @@ -20,8 +20,8 @@ fi # update the settings below, look at src/stage0.json in the Rust sources. exit 0 -BOOTSTRAP_DATE=2022-04-07 -BOOTSTRAP_VERSION=1.60.0 +BOOTSTRAP_DATE=2022-05-19 +BOOTSTRAP_VERSION=1.61.0 BOOTSTRAP_CARGO=$BOOTSTRAP_VERSION # i686 bootstrap: |