summaryrefslogtreecommitdiff
path: root/source/d
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-01-22 22:53:32 +0000
committerEric Hameleers <alien@slackware.com>2020-01-23 08:59:50 +0100
commit4f9273afa49a94b04bccc088fb87fec9d80a3fc6 (patch)
tree4d72218eb61e88572100270416cc562159676018 /source/d
parent24375111b1a4c62f9b704108e98f53002f8c448a (diff)
downloadcurrent-4f9273afa49a94b04bccc088fb87fec9d80a3fc6.tar.gz
Wed Jan 22 22:53:32 UTC 202020200122225332
a/kernel-firmware-20200122_1eb2408-noarch-1.txz: Upgraded. a/pciutils-3.6.3-x86_64-1.txz: Upgraded. a/pkgtools-15.0-noarch-30.txz: Rebuilt. removepkg: prevent upgradepkg noise when a directory turns into a symlink. setup.vi-ex: don't make symlinks if the targets don't exist. d/cmake-3.16.3-x86_64-1.txz: Upgraded. d/distcc-3.3.3-x86_64-3.txz: Rebuilt. Move symlink tree into /usr/lib/distcc/, and make a link in /usr/lib64/ if needed. Seems like this is how everyone else sets it up. Thanks to hpfeil. Recompiled against krb5-1.17.1 (--with-auth). d/parallel-20200122-noarch-1.txz: Upgraded. l/python-urllib3-1.25.8-x86_64-1.txz: Upgraded. n/bind-9.14.10-x86_64-1.txz: Upgraded. This is a bugfix release: With some libmaxminddb versions, named could erroneously match an IP address not belonging to any subnet defined in a given GeoIP2 database to one of the existing entries in that database. [GL #1552] Fix line spacing in `rndc secroots`. Thanks to Tony Finch. [GL #2478] Recompiled against krb5-1.17.1 (--with-gssapi). n/dhcp-4.4.2-x86_64-1.txz: Upgraded. n/p11-kit-0.23.19-x86_64-1.txz: Upgraded. n/php-7.4.2-x86_64-2.txz: Rebuilt. Patched for c-client library API change. Thanks to ecd102. Recompiled against krb5-1.17.1 (--with-kerberos).
Diffstat (limited to 'source/d')
-rwxr-xr-xsource/d/distcc/distcc.SlackBuild28
1 files changed, 14 insertions, 14 deletions
diff --git a/source/d/distcc/distcc.SlackBuild b/source/d/distcc/distcc.SlackBuild
index 454eeb83..4be74e10 100755
--- a/source/d/distcc/distcc.SlackBuild
+++ b/source/d/distcc/distcc.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2013, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2013, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -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
@@ -77,14 +77,6 @@ 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
-
if [ ! -r configure ]; then
./autogen.sh
fi
@@ -95,6 +87,7 @@ fi
--sysconfdir=/etc \
--mandir=/usr/man \
--with-gtk \
+ --with-auth \
--without-gnome \
--without-avahi \
--disable-Werror \
@@ -103,10 +96,10 @@ fi
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG docdir=/usr/doc/distcc-$VERSION || exit 1
-# Make a masquarade directory in /usr/lib${LIBDIRSUFFIX}:
+# Make a masquarade directory in /usr/lib/distcc:
GCCVER=$(gcc -dumpversion)
-mkdir -p $PKG//usr/lib${LIBDIRSUFFIX}/distcc
-( cd $PKG//usr/lib${LIBDIRSUFFIX}/distcc
+mkdir -p $PKG//usr/lib/distcc
+( cd $PKG//usr/lib/distcc
ln -sf ../../bin/distcc c++
ln -sf ../../bin/distcc c89
ln -sf ../../bin/distcc c99
@@ -121,6 +114,14 @@ mkdir -p $PKG//usr/lib${LIBDIRSUFFIX}/distcc
ln -sf ../../bin/distcc $ARCH-slackware-linux-gcc-$GCCVER
)
+# If needed, make a symlink from /usr/lib${LIBDIRSUFFIX}/distcc -> /usr/lib/distcc:
+if [ ! "$LIBDIRSUFFIX" = "" ]; then
+ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+ ( cd $PKG/usr/lib${LIBDIRSUFFIX}
+ ln -sf ../lib/distcc .
+ )
+fi
+
# pkgdocdir=/usr/doc/distcc-$VERSION
mkdir -p $PKG/usr/share/applications
( cd $PKG/usr/share/applications
@@ -154,4 +155,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
/sbin/makepkg -l y -c n $TMP/distcc-$VERSION-$ARCH-$BUILD.txz
-