From e26270f6e50cbe5633f34d0f206635f01583eea2 Mon Sep 17 00:00:00 2001 From: Pouria Rezaei Date: Thu, 27 Jun 2024 01:51:41 +0330 Subject: [PATCH 1/2] system/nix: Updated to 2.18.3. Signed-off-by: Pouria Rezaei --- system/nix/nix.SlackBuild | 2 +- system/nix/nix.info | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/nix/nix.SlackBuild b/system/nix/nix.SlackBuild index 19c3ea638..cd578314f 100644 --- a/system/nix/nix.SlackBuild +++ b/system/nix/nix.SlackBuild @@ -46,7 +46,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nix -VERSION=${VERSION:-2.8.1} +VERSION=${VERSION:-2.18.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/nix/nix.info b/system/nix/nix.info index 2165c124b..68ea3851a 100644 --- a/system/nix/nix.info +++ b/system/nix/nix.info @@ -1,8 +1,8 @@ PRGNAM="nix" -VERSION="2.8.1" +VERSION="2.18.3" HOMEPAGE="http://nixos.org/nix" -DOWNLOAD="https://github.com/NixOS/nix/archive/2.8.1/nix-2.8.1.tar.gz" -MD5SUM="b2b6a1756fc6e44fd78cebcb24818843" +DOWNLOAD="https://github.com/NixOS/nix/archive/2.18.3/nix-2.18.3.tar.gz" +MD5SUM="9d70ad29433b26702f2e6e530dab0d01" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtest jq libeditline lowdown libcpuid mdbook nlohmann_json" From 7efc98d0f730e8f74dec496f4c9cd587bc7cb255 Mon Sep 17 00:00:00 2001 From: Pouria Rezaei Date: Thu, 27 Jun 2024 01:52:25 +0330 Subject: [PATCH 2/2] Obsolete packs --- development/mdbook/mdbook.SlackBuild | 26 +++-- development/mdbook/mdbook.info | 2 +- development/rust16/README | 21 ++++ development/rust16/rust16.SlackBuild | 142 +++++++++++++++++++++++++++ development/rust16/rust16.info | 12 +++ development/rust16/slack-desc | 19 ++++ 6 files changed, 212 insertions(+), 10 deletions(-) create mode 100644 development/rust16/README create mode 100644 development/rust16/rust16.SlackBuild create mode 100644 development/rust16/rust16.info create mode 100644 development/rust16/slack-desc diff --git a/development/mdbook/mdbook.SlackBuild b/development/mdbook/mdbook.SlackBuild index a42eb19d6..381277ff1 100644 --- a/development/mdbook/mdbook.SlackBuild +++ b/development/mdbook/mdbook.SlackBuild @@ -88,17 +88,16 @@ cd $SRCNAM-$VERSION # build offline # configuration tells cargo to use the configured directory # for dependencies intead of downloading from crates.io -mkdir .cargo +mkdir vendor .cargo cat <> .cargo/config.toml -[source.crates-io] -replace-with = "vendored-sources" + [source.crates-io] + replace-with = "vendored-sources" -[source.vendored-sources] -directory = "vendor" + [source.vendored-sources] + directory = "vendor" EOF # deps and versions come from Cargo.lock -mkdir vendor ( cd vendor @@ -131,9 +130,11 @@ mkdir vendor printf "}\n" } > $dep-$ver/.cargo-checksum.json - done + done ) +mkdir -p $PKG/usr/bin + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -142,12 +143,19 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ CARGO_HOME=.cargo \ +PATH="/opt/rust16/bin:$PATH" \ +LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ cargo build --offline --release $CARGOTARGET +PATH="/opt/rust16/bin:$PATH" \ +LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" \ +cargo install --offline --no-track --root "${PKG}/usr" --path="." -mkdir -p $PKG/usr/bin -find target -name $PRGNAM -exec install -s -m 755 {} $PKG/usr/bin/$PRGNAM \; +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a *.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/ diff --git a/development/mdbook/mdbook.info b/development/mdbook/mdbook.info index 60ab12011..81c3247d8 100644 --- a/development/mdbook/mdbook.info +++ b/development/mdbook/mdbook.info @@ -501,6 +501,6 @@ MD5SUM="aedb8898189d95e9c727a6d67c51e10d \ 09de9d01e7331ff3da11f58be8bef0df" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="rust16" MAINTAINER="Pouria Rezaei" EMAIL="Pouria.rz@outlook.com" diff --git a/development/rust16/README b/development/rust16/README new file mode 100644 index 000000000..97cfbe0b1 --- /dev/null +++ b/development/rust16/README @@ -0,0 +1,21 @@ +rust16 installs a limited set of Rust stable binaries to /opt/rust16. +This is to allow Rust-based SlackBuilds to build more recent versions +than would be possible with system Rust. + +To use the rust16 binaries in a SlackBuild, make the following export +statements: + +export PATH="/opt/rust16/bin:$PATH" +if [ -z "$LD_LIBRARY_PATH" ]; then + export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" +else + export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" +fi + +If your SlackBuild experiences build failures on 64-bit systems, please +ensure that the LIBDIRSUFFIX variable is set. + +rust16 is not intended as a substitute for rustup or for the Slackware +Rust package in terms of Rust development purposes. + +Separate downloads are available for i686 and x86_64. diff --git a/development/rust16/rust16.SlackBuild b/development/rust16/rust16.SlackBuild new file mode 100644 index 000000000..bf7e04f9c --- /dev/null +++ b/development/rust16/rust16.SlackBuild @@ -0,0 +1,142 @@ +#!/bin/bash + +# Slackware build script for rust16 + +# Copyright 2023-2024 K. Eugene Carlson Tsukuba, Japan +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=rust16 +SRCNAM=rust +VERSION=${VERSION:-1.79.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac + + if [ "$ARCH" = "i586" ]; then + if rustc -Vv | grep host | grep -q i686; then + ARCH=i686 + fi + fi +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" +else + LIBDIRSUFFIX="" +fi + +if [ "$ARCH" = "arm" ]; then + TRIPLET="$ARCH-unknown-linux-gnueabihf" +else + TRIPLET="$ARCH-unknown-linux-gnu" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION-$TRIPLET +tar xvf $CWD/$SRCNAM-$VERSION-$TRIPLET.tar.gz +cd $SRCNAM-$VERSION-$TRIPLET +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +./install.sh \ + --destdir=$PKG \ + --prefix="opt/rust16" \ + --disable-ldconfig \ + --without=rust-docs-json-preview,\ +rust-docs,\ +clippy-preview,\ +rls-preview,\ +llvm-tools-preview,\ +llvm-bitcode-linker-preview,\ +rust-analysis-$TRIPLET,\ +rust-analyzer-preview,\ +rust-demangler-preview,\ +rustfmt-preview + +find $PKG/opt/$PRGNAM/lib -type f -name "*.so" -exec chmod +x {} \; 2> /dev/null || true +find $PKG/opt/$PRGNAM/lib -type f -name "*.so*stable" -exec chmod +x {} \; 2> /dev/null || true +# Stripping the libraries causes memory faults on Slackware64-15.0. +if [ $ARCH = "x86_64" ]; then + find $PKG -print0 | xargs -0 file | grep "executable" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +else + find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +fi + +rm -f $PKG/opt/$PRGNAM/lib/rustlib/uninstall.sh +rm -f $PKG/opt/$PRGNAM/lib/rustlib/install.log +rm -f $PKG/opt/$PRGNAM/lib/rustlib/manifest-* +rm -f $PKG/opt/$PRGNAM/lib/rustlib/rust-installer-version +rm -f $PKG/opt/$PRGNAM/lib/rustlib/components + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + $PKG/opt/$PRGNAM/share/doc/* \ + COPYRIGHT LICENSE-APACHE LICENSE-MIT \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.sw + +# Nothing in share is needed at this point. +rm -rf $PKG/opt/$PRGNAM/share +# Don't need bash completions. +rm -rf $PKG/opt/$PRGNAM/etc +# Appropriate directory name for the lib dir. +[ -n "$LIBDIRSUFFIX" ] && mv $PKG/opt/$PRGNAM/lib $PKG/opt/$PRGNAM/lib$LIBDIRSUFFIX + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/rust16/rust16.info b/development/rust16/rust16.info new file mode 100644 index 000000000..43d765fe6 --- /dev/null +++ b/development/rust16/rust16.info @@ -0,0 +1,12 @@ +PRGNAM="rust16" +VERSION="1.79.0" +HOMEPAGE="https://rust-lang.org" +DOWNLOAD="https://static.rust-lang.org/dist/2024-06-13/rust-1.79.0-i686-unknown-linux-gnu.tar.gz \ + https://static.rust-lang.org/dist/2024-06-13/rust-1.79.0-arm-unknown-linux-gnueabihf.tar.gz" +MD5SUM="14d04dfa5b8db0e4c60b3ca510413154 \ + b935f3d193c8618d9bfe3ab97ad99d4e" +DOWNLOAD_x86_64="https://static.rust-lang.org/dist/2024-06-13/rust-1.79.0-x86_64-unknown-linux-gnu.tar.gz" +MD5SUM_x86_64="6f2d7072b8bcd817f9effa0c504e31e9" +REQUIRES="" +MAINTAINER="K. Eugene Carlson" +EMAIL="kvngncrlsn@gmail.com" diff --git a/development/rust16/slack-desc b/development/rust16/slack-desc new file mode 100644 index 000000000..59a492264 --- /dev/null +++ b/development/rust16/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +rust16: rust16 (Rust: a safe, concurrent, practical language) +rust16: +rust16: rust16 installs a limited set of up-to-date Rust stable binaries to +rust16: /opt/rust16 for use in SlackBuilds. +rust16: +rust16: +rust16: +rust16: +rust16: +rust16: +rust16: Homepage: https://rust-lang.org