diff options
Diffstat (limited to 'source/d')
-rwxr-xr-x | source/d/cscope/cscope.SlackBuild | 8 | ||||
-rw-r--r-- | source/d/cscope/slack-desc | 2 | ||||
-rwxr-xr-x | source/d/distcc/distcc.SlackBuild | 6 | ||||
-rw-r--r-- | source/d/nasm/0001-Remove-invalid-pure_func-qualifiers.patch | 27 | ||||
-rwxr-xr-x | source/d/nasm/nasm.SlackBuild | 13 | ||||
-rwxr-xr-x | source/d/oprofile/oprofile.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/rust/rust.SlackBuild | 2 | ||||
-rw-r--r-- | source/d/rust/rust.url | 2 |
8 files changed, 20 insertions, 42 deletions
diff --git a/source/d/cscope/cscope.SlackBuild b/source/d/cscope/cscope.SlackBuild index 4ebf2c36a..1f4ea40fb 100755 --- a/source/d/cscope/cscope.SlackBuild +++ b/source/d/cscope/cscope.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cscope -VERSION=${VERSION:-$(echo $(basename $(echo $PKGNAM-*.tar.xz | cut -f 2 -d -) .tar.xz) | cut -f 2 -d -)} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -74,7 +74,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-$VERSION -tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 chown -R root:root . find . \ @@ -88,7 +88,7 @@ CFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --build=${ARCH}-slackware-linux + --build=${ARCH}-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/d/cscope/slack-desc b/source/d/cscope/slack-desc index 4521c5f7e..c5e78c6ea 100644 --- a/source/d/cscope/slack-desc +++ b/source/d/cscope/slack-desc @@ -12,7 +12,7 @@ cscope: Cscope is a text screen based source browsing tool. Although it is cscope: primarily designed to search C code (including lex and yacc files), cscope: it can also be used for C++ code. cscope: -cscope: For more information, see http://cscope.sourceforge.net. +cscope: Homepage: http://cscope.sourceforge.net cscope: cscope: cscope: diff --git a/source/d/distcc/distcc.SlackBuild b/source/d/distcc/distcc.SlackBuild index 24f68aa26..9ba5e1c63 100755 --- a/source/d/distcc/distcc.SlackBuild +++ b/source/d/distcc/distcc.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=distcc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -85,6 +85,10 @@ if [ ! "$LIBDIRSUFFIX" = "" ]; then fi sed -i "s|usr/lib/gcc|usr/lib${LIBDIRSUFFIX}/gcc|g" update-distcc-symlinks.py +if [ ! -r configure ]; then + ./autogen.sh +fi + ./configure \ --prefix=/usr \ --datadir=/usr/share \ diff --git a/source/d/nasm/0001-Remove-invalid-pure_func-qualifiers.patch b/source/d/nasm/0001-Remove-invalid-pure_func-qualifiers.patch deleted file mode 100644 index 87ec601c2..000000000 --- a/source/d/nasm/0001-Remove-invalid-pure_func-qualifiers.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d0dabb46a821b2506681f882af0d5696d2c2bade Mon Sep 17 00:00:00 2001 -From: Michael Simacek <msimacek@redhat.com> -Date: Thu, 8 Feb 2018 14:47:08 +0100 -Subject: [PATCH] Remove invalid pure_func qualifiers - ---- - include/nasmlib.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/nasmlib.h b/include/nasmlib.h -index 79e866b..c93cef0 100644 ---- a/include/nasmlib.h -+++ b/include/nasmlib.h -@@ -191,8 +191,8 @@ int64_t readstrnum(char *str, int length, bool *warn); - * seg_init: Initialise the segment-number allocator. - * seg_alloc: allocate a hitherto unused segment number. - */ --void pure_func seg_init(void); --int32_t pure_func seg_alloc(void); -+void seg_init(void); -+int32_t seg_alloc(void); - - /* - * many output formats will be able to make use of this: a standard --- -2.14.3 - diff --git a/source/d/nasm/nasm.SlackBuild b/source/d/nasm/nasm.SlackBuild index 458cabb8a..1e19f070f 100755 --- a/source/d/nasm/nasm.SlackBuild +++ b/source/d/nasm/nasm.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=nasm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -44,6 +44,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + if [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" else @@ -60,9 +62,6 @@ rm -rf nasm-$VERSION tar xvf $CWD/nasm-$VERSION.tar.?z* || exit 1 cd nasm-$VERSION || exit 1 -# Fix FTBFS with gcc8: -zcat $CWD/0001-Remove-invalid-pure_func-qualifiers.patch.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -76,13 +75,15 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --build=${ARCH}-slackware-linux || exit 1 -make || exit 1 +make $NUMJOBS || make || exit 1 + ( cd doc make nasmdoc.txt || exit 1 mkdir -p $PKG/usr/doc/nasm-$VERSION cp nasmdoc.txt $PKG/usr/doc/nasm-$VERSION ) || exit 1 -make install INSTALLROOT=$PKG || exit 1 + +make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild index 84f0240ac..fe1748729 100755 --- a/source/d/oprofile/oprofile.SlackBuild +++ b/source/d/oprofile/oprofile.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=oprofile VERSION=${VERSION:-$(echo oprofile-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index cfc085ddb..cfd55595d 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.30.0} +VERSION=${VERSION:-1.30.1} BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index c6e448fe9..0131e8130 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.xz): -lftpget https://static.rust-lang.org/dist/rustc-1.30.0-src.tar.gz +lftpget https://static.rust-lang.org/dist/rustc-1.30.1-src.tar.gz gzip -d rustc-*tar.gz plzip -9 -v rustc-*tar |