summaryrefslogtreecommitdiffstats
path: root/source/d/distcc
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-08-10 22:42:55 +0000
committer Eric Hameleers <alien@slackware.com>2018-08-11 09:00:31 +0200
commitcc59e5e82c942adec962972f51c9818f1d1cc185 (patch)
tree8075dfa93f705ab020bf39b8ad7114eeba2191f8 /source/d/distcc
parent16c26916c02e8f062fc4cdf8fbb8f5be9b204093 (diff)
downloadcurrent-cc59e5e82c942adec962972f51c9818f1d1cc185.tar.gz
current-cc59e5e82c942adec962972f51c9818f1d1cc185.tar.xz
Fri Aug 10 22:42:55 UTC 201820180810224255
a/kernel-generic-4.14.62-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.62-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.62-x86_64-1.txz: Upgraded. ap/pamixer-1.3.1-x86_64-7.txz: Rebuilt. Recompiled against boost-1.68.0. d/cmake-3.12.1-x86_64-1.txz: Upgraded. d/distcc-3.3-x86_64-3.txz: Rebuilt. Install masquerade symlinks in /usr/lib${LIBDIRSUFFIX}/distcc/. d/kernel-headers-4.14.62-x86-1.txz: Upgraded. k/kernel-source-4.14.62-noarch-1.txz: Upgraded. kde/calligra-2.9.11-x86_64-24.txz: Rebuilt. Recompiled against boost-1.68.0. l/akonadi-1.13.0-x86_64-10.txz: Rebuilt. Recompiled against boost-1.68.0. l/boost-1.68.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/harfbuzz-1.8.7-x86_64-1.txz: Upgraded. l/libgsf-1.14.44-x86_64-1.txz: Upgraded. l/librsvg-2.42.6-x86_64-1.txz: Upgraded. l/libsoup-2.62.3-x86_64-1.txz: Upgraded. n/bind-9.12.2_P1-x86_64-1.txz: Upgraded. Fixed a security issue where named could crash during recursive processing of DNAME records when "deny-answer-aliases" was in use resulting in a denial of service. Note that "deny-answer-aliases" is rarely used. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-5740 (* Security fix *) xap/audacious-3.10-x86_64-1.txz: Upgraded. xap/audacious-plugins-3.10-x86_64-1.txz: Upgraded. extra/pure-alsa-system/audacious-plugins-3.10-x86_64-1_alsa.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/d/distcc')
-rwxr-xr-xsource/d/distcc/distcc.SlackBuild43
1 files changed, 42 insertions, 1 deletions
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