Mercurial > hg > aboriginal
changeset 613:518c8e257b3d
Fixes Mark Miller sent for distcc support.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sun, 08 Feb 2009 03:08:57 -0600 |
parents | 301810fee287 |
children | d771a938c673 |
files | download.sh mini-native.sh run-from-build.sh sources/toys/run-emulator.sh |
diffstat | 4 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/download.sh Sat Feb 07 20:35:51 2009 -0600 +++ b/download.sh Sun Feb 08 03:08:57 2009 -0600 @@ -78,6 +78,7 @@ URL=http://distcc.samba.org/ftp/distcc/distcc-2.18.3.tar.bz2 \ SHA1=88e4c15826bdbc5a3de0f7c1bcb429e558c6976d \ +uNSTABLE=http://distcc.googlecode.com/files/distcc-3.1.tar.bz2 \ download || dienow URL=http://downloads.sourceforge.net/sourceforge/strace/strace-4.5.14.tar.bz2 \
--- a/mini-native.sh Sat Feb 07 20:35:51 2009 -0600 +++ b/mini-native.sh Sun Feb 08 03:08:57 2009 -0600 @@ -262,7 +262,7 @@ setupfor distcc CC="${ARCH}-cc" ./configure --host="${CROSS_TARGET}" --prefix="${TOOLS}" \ - --with-included-popt && + --with-included-popt --disable-Werror && make -j $CPUS && make -j $CPUS install && mkdir -p "${TOOLS}/distcc" || dienow
--- a/run-from-build.sh Sat Feb 07 20:35:51 2009 -0600 +++ b/run-from-build.sh Sun Feb 08 03:08:57 2009 -0600 @@ -12,4 +12,4 @@ # And run it, using the distccd we built (if necessary) and the cross-compiler. PATH="$HOSTTOOLS:$PATH" ./run-emulator.sh --make-hdb 2048 --memory 256 \ - --with-distcc "$CROSS" + --with-distcc "${BUILD}/cross-compiler-${ARCH}"
--- a/sources/toys/run-emulator.sh Sat Feb 07 20:35:51 2009 -0600 +++ b/sources/toys/run-emulator.sh Sun Feb 08 03:08:57 2009 -0600 @@ -71,16 +71,16 @@ # Note that we tell it --no-detach and background it oursleves so jobs -p can # find it later to kill it after the emulator exits. - PATH="$(readlink -f "$DISTCC_PATH"/*-unknown-linux/bin)" "$DCC" --listen 127.0.0.1 \ - --no-detach --log-file distccd.log --log-level warning --daemon \ + CPUS=$[$(echo /sys/devices/system/cpu/cpu[0-9]* | wc -w)*2] + PATH="$(readlink -f "$DISTCC_PATH"/tools/bin)" "$DCC" --listen 127.0.0.1 \ + --no-detach --log-file distccd.log --verbose --jobs ${CPUS} --daemon \ -a 127.0.0.1 -p $PORT & # Cleanup afterwards: Kill child processes we started (I.E. distccd). trap "kill $(jobs -p)" EXIT # Prepare some environment variables for run-qemu.sh - DISTCC_PATH_PREFIX=/tools/distcc: - CPUS=$[$(echo /sys/devices/system/cpu/cpu[0-9]* | wc -w)*2] + DISTCC_PATH_PREFIX=/usr/distcc:/tools/distcc: KERNEL_EXTRA="DISTCC_HOSTS=10.0.2.2:$PORT CPUS=$CPUS $KERNEL_EXTRA" fi