adium 3541:e0240851de67: Enable libpurple (and deps) to build wi...
commits at adium.im
commits at adium.im
Tue Nov 16 09:36:33 UTC 2010
details: http://hg.adium.im/adium/rev/e0240851de67
revision: 3541:e0240851de67
author: Stephen Holt <sholt at adium.im>
date: Tue Nov 16 01:34:44 2010 -0800
Enable libpurple (and deps) to build with distcc.
Added --enable-distcchost=[host] flag to build.sh, which configures the host to be used for distcc. Multiple flags may be used for mutiple hosts. Will adjust max job count with host scale.
Distributed building, FTW!
diffs (51 lines):
diff -r a72717d2473e -r e0240851de67 Dependencies/build.sh
--- a/Dependencies/build.sh Tue Nov 16 00:02:03 2010 -0500
+++ b/Dependencies/build.sh Tue Nov 16 01:34:44 2010 -0800
@@ -95,6 +95,11 @@
BUILD_OTR=true
status "Building libotr"
;;
+ --enable-distcchost=*)
+ asserttools "/Developer/usr/bin/distcc"
+ asserttools "/Developer/usr/bin/pump"
+ export DISTCC_HOSTS="${DISTCC_HOSTS:=} ${option##*=},lzo,cpp"
+ ;;
--enable-llvm)
asserttools "/Developer/usr/bin/llvm-gcc"
export CC="/Developer/usr/bin/llvm-gcc"
@@ -124,6 +129,8 @@
(currently breaks liboil on x86_64)
--build-otr : Build libotr and dependancies instead
of libpurple.
+ --enable-distcchost=[host] : Add a host to the distcc conf. Enables distcc build.
+ `man distcc` for more information.
--enable-llvm : Enable building with llvm-gcc.
WARNING: This is currently broken!
--libpurple-rev=[rev] : Force a specific libpurple revision
@@ -143,6 +150,15 @@
esac
done
+if [ "$DISTCC_HOSTS" ]; then
+ export DISTCC_HOSTS="--randomize ${DISTCC_HOSTS} localhost/${NUMBER_OF_CORES}"
+ export DISTCC_COMPILER=$(${CC:=/Developer/usr/bin/gcc} --version|head -n1)
+ export CC="/Developer/usr/bin/distcc ${CC:=/Developer/usr/bin/gcc}"
+ export CXX="/Developer/usr/bin/distcc ${CXX:=/Developer/usr/bin/g++}"
+ NUMBER_OF_CORES=`/Developer/usr/bin/distcc -j`
+ eval `/Developer/usr/bin/pump --startup`
+fi
+
# this file contans the stdio and stderr of the most recent build
LOG_FILE="${ROOTDIR}/build.log"
ERR_FILE="${ROOTDIR}/error.log"
@@ -195,6 +211,10 @@
fi
fi
+if [ "$DISTCC_HOSTS" ]; then
+ /Developer/usr/bin/pump --shutdown
+fi
+
make_framework $@
#ugly. gotta be a better way
More information about the commits
mailing list