Updated distcc to 3.0.

diff --git a/lfs/distcc b/lfs/distcc
index c67de0c5940140be5aed2c62e445f0cb5893ccbc..67a826ea4bb153b069cd10d55a79267a06cfc6e0 100644 (file)
--- a/lfs/distcc
+++ b/lfs/distcc
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = distcc
-VER        = 2.18.3
+VER        = 3.0
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -53,7 +53,13 @@ $(objects) :
 $(TARGET) : 
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && CFLAGS="-O2 -static" ./configure --prefix=$(PREFIX)
+       cd $(DIR_APP) && \
+               CFLAGS="-O2 -static" \
+               ./configure \
+                       --prefix=$(PREFIX) \
+                       --with-included-popt \
+                       --without-avahi
+       cd $(DIR_APP) && sed -e "s/-Werror//g" -i Makefile
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
        #ln -sf distcc $(PREFIX)/bin/gcc

diff --git a/tools/make-compilers b/tools/make-compilers
index 12a84293d75d5ec104d4a2f942839a1a6c4dab35..ecb00c96b6ab9fa07bb696c5fd550ac405915e83 100755 (executable)
--- a/tools/make-compilers
+++ b/tools/make-compilers
@@ -58,6 +58,7 @@ distccd_start() {
        fi
 
        TOOLS_DIR=$TOOLS_DIR DISTCC_PORT=$DISTCC_PORT \
+               LOGFILE=$BASEDIR/log_${MACHINE}/_build.00-distccd.log \
                $BASEDIR/tools/make-compilers &
        if [ "$?" -eq "0" ]; then
                beautify message DONE
@@ -68,7 +69,7 @@ distccd_start() {
 
 distccd_stop() {
        echo -n "Stopping distcc daemon"
-       killall distccd
+       killall distccd &>/dev/null
        if [ "$?" -eq "0" ]; then
                beautify message DONE
        else
@@ -88,12 +89,14 @@ if [ "$(basename $0)" == "make-compilers" ]; then
        # Run distccd
        DISTCCD_PATH=$TOOLS_DIR/bin:$(echo $TOOLS_DIR/libexec/gcc/*-pc-linux-gnu/*/) \
                $TOOLS_DIR/usr/bin/distccd --daemon --allow 0.0.0.0/0 \
-               --user nobody --nice 10 --jobs 8 --port $DISTCC_PORT &>/dev/null
+               --user nobody --nice 10 --jobs 8 --port $DISTCC_PORT \
+               --log-file $LOGFILE --stats --job-lifetime 600 \
+               --stats-port $(( $DISTCC_PORT + 1 )) &>/dev/null
 
        # When $TOOLS_DIR is not available (esp. gcc) --> exit
        while pidof distccd >/dev/null && [ -x $TOOLS_DIR/bin/gcc ]; do
                sleep 10
        done
 
-       distccd_stop
+       killall distccd &>/dev/null
 fi