summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJudd Vinet <judd@archlinux.org>2005-12-14 02:40:01 +0000
committerJudd Vinet <judd@archlinux.org>2005-12-14 02:40:01 +0000
commit50be438d4a33e08dd310206425e3e05788c66330 (patch)
tree0f9d3b861797382af717ad3113dad907afe113bc
parent1969a8beb93eaecb9e3698f1f0da65295878d55b (diff)
added frugalware patch for DistCC support
-rw-r--r--etc/makepkg.conf14
-rwxr-xr-xscripts/makepkg9
2 files changed, 19 insertions, 4 deletions
diff --git a/etc/makepkg.conf b/etc/makepkg.conf
index 2846624a..224a9a9d 100644
--- a/etc/makepkg.conf
+++ b/etc/makepkg.conf
@@ -12,21 +12,27 @@ export CHOST="i686-pc-linux-gnu"
# Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon exclusive (binaries
# will use the P6 instruction set and only run on P6+ systems)
-export CFLAGS="-march=i686 -O2 -pipe -Wl,-O1"
-export CXXFLAGS="-march=i686 -O2 -pipe -Wl,-O1"
+export CFLAGS="-march=i686 -O2 -pipe"
+export CXXFLAGS="-march=i686 -O2 -pipe"
# Pentium Pro/Pentium II/Pentium III+/Pentium 4/Athlon optimized (but binaries
# will run on any x86 system)
#export CFLAGS="-mcpu=i686 -O2 -pipe"
#export CXXFLAGS="-mcpu=i686 -O2 -pipe"
# SMP Systems
-#export MAKEFLAGS="-j 2"
+#export MAKEFLAGS="-j2"
# Enable fakeroot for building packages as a non-root user
export USE_FAKEROOT="y"
+# Enable distributed C/C++/ObjC compiler
+# Also modify MAKEFLAGS to include -jN, where N = 2 * (numCPUs+1)
+export DISTCC="n"
+# Space-delimited list of hosts running in the distcc cluster
+export DISTCC_HOSTS=""
+
# Enable colorized output messages
-export USE_COLOR="n"
+export USE_COLOR="y"
# Specify a fixed directory where all packages will be placed
#export PKGDEST=/home/packages
diff --git a/scripts/makepkg b/scripts/makepkg
index 02e7d895..c1df97eb 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -591,6 +591,15 @@ if [ "$NOBUILD" = "1" ]; then
exit 0
fi
+# use distcc if requested
+if [ "$DISTCC" = "y" ]; then
+ [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH
+ if [ "$INCHROOT" = "1" ]; then
+ [ -d /var/tmp/fst/.distcc ] || mkdir /var/tmp/fst/.distcc
+ export DISTCC_DIR=/var/tmp/fst/.distcc
+ fi
+fi
+
# use ccache if it's available
if [ "$NOCCACHE" = "0" ]; then
[ -d /usr/lib/ccache/bin ] && export PATH=/usr/lib/ccache/bin:$PATH