From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 15 Jul 2009 22:33:44 +0000 (+0200)
Subject: Fixed and updates buildscripts.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b2fee31c61f7298df49c901be9be7c3130c8795;p=ipfire-3.x.git

Fixed and updates buildscripts.
---

diff --git a/make.sh b/make.sh
index bb6c94d17..f95538563 100755
--- a/make.sh
+++ b/make.sh
@@ -38,7 +38,7 @@ SLOGAN="Gluttony"		# Software slogan
 toolchain_build() {
 
 	ORG_PATH=$PATH
-	export PATH=${TOOLS_DIR}/usr/bin:${TOOLS_DIR}/bin:$PATH
+	export PATH=${TOOLS_DIR}/usr/bin:${TOOLS_DIR}/usr/sbin:${TOOLS_DIR}/bin:${TOOLS_DIR}/sbin:$PATH
 	STAGE_ORDER=01
 	STAGE=toolchain
 
@@ -50,15 +50,11 @@ toolchain_build() {
 	# We can't skip packages in toolchain stage
 	SAVE_SKIP_PACKAGE_LIST=$SKIP_PACKAGE_LIST
 	SKIP_PACKAGE_LIST=
-	
-	# Disable icecc in here
-	SAVE_ICECC=$ICECC
-	ICECC=off
-	iceccd_stop
+
+	SAVE_CCACHE_PREFIX=$CCACHE_PREFIX
+	unset CCACHE_PREFIX
 
 	toolchain_make stage1
-	# make icecc first so that CCACHE_PREFIX works immediately
-	toolchain_make icecc
 	toolchain_make ccache
 	toolchain_make binutils		PASS=1
 	toolchain_make gcc		PASS=1
@@ -70,15 +66,6 @@ toolchain_build() {
 	toolchain_make gcc		PASS=2
 	toolchain_make binutils		PASS=2
 	toolchain_make test-toolchain	PASS=2
-
-	ICECC=$SAVE_ICECC
-	unset SAVE_ICECC
-
-	ICECC_CC="${TOOLS_DIR}/bin/gcc" \
-	ICECC_CXX="${TOOLS_DIR}/bin/g++" \
-		icecc_build_native ${ICECC_TOOLCHAIN}
-	iceccd_start
-
 	toolchain_make ncurses
 	toolchain_make attr
 	toolchain_make acl
@@ -105,10 +92,16 @@ toolchain_build() {
 	toolchain_make flex
 	toolchain_make bc
 	toolchain_make xz
+	toolchain_make icecc
+	toolchain_make autoconf
+	toolchain_make automake
 	toolchain_make strip
 
 	export PATH=$ORG_PATH SKIP_PACKAGE_LIST=$SAVE_SKIP_PACKAGE_LIST
 	unset SAVE_SKIP_PACKAGE_LIST
+
+	CCACHE_PREFIX=$SAVE_CCACHE_PREFIX
+	unset SAVE_CCACHE_PREFIX
 }
 
 ################################################################################
@@ -125,6 +118,8 @@ base_build() {
 
 	build_spy stage ${STAGE}
 
+	iceccd_stop
+
 	ipfire_make stage2
 	ipfire_make scripts
 	ipfire_make system-release
@@ -136,6 +131,11 @@ base_build() {
 	ipfire_make zlib
 	ipfire_make binutils
 	ipfire_make gcc
+
+	icecc_build_native ${ICECC_TOOLCHAIN}
+	iceccd_start
+	ICECC_VERSION=${ICECC_TOOLCHAIN}
+
 	ipfire_make make
 	ipfire_make libtool
 	ipfire_make gettext
diff --git a/tools/make-cluster b/tools/make-cluster
index bc131bef7..a683937f2 100644
--- a/tools/make-cluster
+++ b/tools/make-cluster
@@ -34,7 +34,7 @@ function iceccd_start() {
 		return
 	fi
 	local toolchain=${1}
-	ICECC_VERSION=${toolchain} iceccd -d -s ${ICECC_SCHEDULER} -m ${ICECC_JOBS-5}
+	ICECC_VERSION=${toolchain} ${TOOLS_DIR}/usr/sbin/iceccd -vvv -d -s ${ICECC_SCHEDULER} -m ${ICECC_JOBS-5}
 }
 
 function iceccd_stop() {
diff --git a/tools/make-constants b/tools/make-constants
index 257d9355b..99a40924e 100644
--- a/tools/make-constants
+++ b/tools/make-constants
@@ -91,7 +91,7 @@ else
 fi
 
 LINKER=/lib/ld-linux.so.2
-GLOBAL_CFLAGS="-fomit-frame-pointer -fPIC -pipe -g"
+GLOBAL_CFLAGS="-fomit-frame-pointer -pipe"
 if [ 'i686' = $TARGET -o 'i586' = $TARGET \
 	-o 'i486' = $TARGET ]; then
 	MACHINE=${TARGET}
diff --git a/tools/make-include b/tools/make-include
index a2da3610e..3c5395319 100644
--- a/tools/make-include
+++ b/tools/make-include
@@ -280,10 +280,10 @@ toolchain_make() {
 		EMB="${EMB}" \
 		\
 		CCACHE_DIR="${BASEDIR}/ccache" \
-		CCACHE_PREFIX="${CCACHE_PREFIX}" \
+		$([ -n "${CCACHE_PREFIX}" ] && echo CCACHE_PREFIX="${CCACHE_PREFIX}") \
 		CCACHE_HASHDIR="${CCACHE_HASHDIR}" \
 		ICECC="${ICECC}" \
-		$([ -n "${ICECC_VERSION}" ] && echo ICECC_VERSION="${ICECC_TOOLCHAIN}") \
+		$([ -n "${ICECC_VERSION}" ] && echo ICECC_VERSION="${ICECC_VERSION}") \
 		USE_SCHEDULER="${ICECC_SCHEDULER}" \
 		\
 		LINKER="${LINKER}" \
@@ -356,10 +356,9 @@ ipfire_make() {
 		EMB="${EMB}" \
 		\
 		CCACHE_DIR="/usr/src/ccache" \
-		CCACHE_PREFIX="${CCACHE_PREFIX}" \
+		$([ -n "${CCACHE_PREFIX}" ] && echo CCACHE_PREFIX="${CCACHE_PREFIX}") \
 		CCACHE_HASHDIR="${CCACHE_HASHDIR}" \
-		$([ -n "${ICECC_VERSION}" ] && echo ICECC_VERSION="${ICECC_TOOLCHAIN}")
-		ICECC_VERSION="${ICECC_TOOLCHAIN}" \
+		$([ -n "${ICECC_VERSION}" ] && echo ICECC_VERSION="${ICECC_VERSION}") \
 		USE_SCHEDULER="${ICECC_SCHEDULER}" \
 		\
 		LINKER="${LINKER}" \
@@ -679,9 +678,6 @@ build() {
 		fi
 	fi
 
-	# Run icecc daemon
-	iceccd_start
-
 	beautify build_stage "Building base"
 	base_build