diff options
Diffstat (limited to 'source')
14 files changed, 59 insertions, 18 deletions
diff --git a/source/ap/pamixer/pamixer.SlackBuild b/source/ap/pamixer/pamixer.SlackBuild index 4fc58bba7..80eac7fef 100755 --- a/source/ap/pamixer/pamixer.SlackBuild +++ b/source/ap/pamixer/pamixer.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pamixer VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/d/distcc/distcc.SlackBuild b/source/d/distcc/distcc.SlackBuild index 7d6947f49..017a392a7 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:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -36,6 +36,20 @@ if [ -z "$ARCH" ]; then esac fi +if [ "$ARCH" = "i586" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + LIBDIRSUFFIX="" +else + LIBDIRSUFFIX="" +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. @@ -63,10 +77,19 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Make sure we change code/docs to use lib64 if needed: +if [ ! "$LIBDIRSUFFIX" = "" ]; then + grep -l -r usr/lib/distcc | while read file ; do + sed -i "s|usr/lib/distcc|usr/lib${LIBDIRSUFFIX}/distcc|g" $file + done +fi +sed -i "s|usr/lib/gcc|usr/lib${LIBDIRSUFFIX}/gcc|g" update-distcc-symlinks.py + ./configure \ --prefix=/usr \ --datadir=/usr/share \ --sysconfdir=/etc \ + --mandir=/usr/man \ --with-gtk \ --without-gnome \ --without-avahi \ @@ -76,6 +99,24 @@ find . \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG docdir=/usr/doc/distcc-$VERSION || exit 1 +# Make a masquarade directory in /usr/lib${LIBDIRSUFFIX}: +GCCVER=$(gcc -dumpversion) +mkdir -p $PKG//usr/lib${LIBDIRSUFFIX}/distcc +( cd $PKG//usr/lib${LIBDIRSUFFIX}/distcc + ln -sf ../../bin/distcc c++ + ln -sf ../../bin/distcc c89 + ln -sf ../../bin/distcc c99 + ln -sf ../../bin/distcc cc + ln -sf ../../bin/distcc clang + ln -sf ../../bin/distcc clang++ + ln -sf ../../bin/distcc g++ + ln -sf ../../bin/distcc gcc + ln -sf ../../bin/distcc gcc-$GCCVER + ln -sf ../../bin/distcc $ARCH-slackware-linux-g++ + ln -sf ../../bin/distcc $ARCH-slackware-linux-gcc + ln -sf ../../bin/distcc $ARCH-slackware-linux-gcc-$GCCVER +) + # pkgdocdir=/usr/doc/distcc-$VERSION mkdir -p $PKG/usr/share/applications ( cd $PKG/usr/share/applications diff --git a/source/k/kernel-configs/config-generic-4.14.61 b/source/k/kernel-configs/config-generic-4.14.62 index fc320188b..df7b77029 100644 --- a/source/k/kernel-configs/config-generic-4.14.61 +++ b/source/k/kernel-configs/config-generic-4.14.62 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.61 Kernel Configuration +# Linux/x86 4.14.62 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/source/k/kernel-configs/config-generic-4.14.61.x64 b/source/k/kernel-configs/config-generic-4.14.62.x64 index d380828f9..9478f1ff8 100644 --- a/source/k/kernel-configs/config-generic-4.14.61.x64 +++ b/source/k/kernel-configs/config-generic-4.14.62.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.61 Kernel Configuration +# Linux/x86 4.14.62 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/source/k/kernel-configs/config-generic-smp-4.14.61-smp b/source/k/kernel-configs/config-generic-smp-4.14.62-smp index 3cace4599..473d305f2 100644 --- a/source/k/kernel-configs/config-generic-smp-4.14.61-smp +++ b/source/k/kernel-configs/config-generic-smp-4.14.62-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.61 Kernel Configuration +# Linux/x86 4.14.62 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/source/k/kernel-configs/config-huge-4.14.61 b/source/k/kernel-configs/config-huge-4.14.62 index fe68efdbb..c2022ae5e 100644 --- a/source/k/kernel-configs/config-huge-4.14.61 +++ b/source/k/kernel-configs/config-huge-4.14.62 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.61 Kernel Configuration +# Linux/x86 4.14.62 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/source/k/kernel-configs/config-huge-4.14.61.x64 b/source/k/kernel-configs/config-huge-4.14.62.x64 index 07be01015..bea43e83a 100644 --- a/source/k/kernel-configs/config-huge-4.14.61.x64 +++ b/source/k/kernel-configs/config-huge-4.14.62.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.61 Kernel Configuration +# Linux/x86 4.14.62 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/source/k/kernel-configs/config-huge-smp-4.14.61-smp b/source/k/kernel-configs/config-huge-smp-4.14.62-smp index ae34a5211..5dbc39c71 100644 --- a/source/k/kernel-configs/config-huge-smp-4.14.61-smp +++ b/source/k/kernel-configs/config-huge-smp-4.14.62-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.61 Kernel Configuration +# Linux/x86 4.14.62 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/source/kde/build/calligra b/source/kde/build/calligra index 409940768..a45fd52cc 100644 --- a/source/kde/build/calligra +++ b/source/kde/build/calligra @@ -1 +1 @@ -23 +24 diff --git a/source/l/akonadi/akonadi.SlackBuild b/source/l/akonadi/akonadi.SlackBuild index 2f0fbe4db..851f707b9 100755 --- a/source/l/akonadi/akonadi.SlackBuild +++ b/source/l/akonadi/akonadi.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=akonadi VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-9} +BUILD=${BUILD:-10} NUMJOBS=${NUMJOBS:--j7} diff --git a/source/l/libgsf/libgsf.SlackBuild b/source/l/libgsf/libgsf.SlackBuild index 36e38b4fd..3ae1c7844 100755 --- a/source/l/libgsf/libgsf.SlackBuild +++ b/source/l/libgsf/libgsf.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libgsf VERSION=${VERSION:-$(echo libgsf-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild index f88e5d8ec..ec4d32269 100755 --- a/source/n/bind/bind.SlackBuild +++ b/source/n/bind/bind.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bind -VERSION=${VERSION:-9.12.2} +VERSION=${VERSION:-9.12.2-P1} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/xap/audacious-plugins/audacious-plugins.SlackBuild b/source/xap/audacious-plugins/audacious-plugins.SlackBuild index cc5d07296..1817cff56 100755 --- a/source/xap/audacious-plugins/audacious-plugins.SlackBuild +++ b/source/xap/audacious-plugins/audacious-plugins.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=audacious-plugins -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -76,7 +76,7 @@ rm -rf $PKG 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 # Make sure ownerships and permissions are sane: diff --git a/source/xap/audacious/audacious.SlackBuild b/source/xap/audacious/audacious.SlackBuild index b99953f95..fce484074 100755 --- a/source/xap/audacious/audacious.SlackBuild +++ b/source/xap/audacious/audacious.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=audacious -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -76,7 +76,7 @@ rm -rf $PKG 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 # Make sure ownerships and permissions are sane: |