adium 2689:77a54b99edfe: Split the output into a build log and e...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/77a54b99edfe
revision:	2689:77a54b99edfe
author:		Stephen Holt <sholt at adium.im>
date:		Sun Sep 06 20:48:51 2009 -0400

Split the output into a build log and error log.
Subject: adium 2690:f96fa4c1e33d: Gettext needs some platform specific settings in it's config files

details:	http://hg.adium.im/adium/rev/f96fa4c1e33d
revision:	2690:f96fa4c1e33d
author:		Stephen Holt <sholt at adium.im>
date:		Sun Sep 06 20:48:51 2009 -0400

Gettext needs some platform specific settings in it's config files
Subject: adium 2691:ae5b6a36fda5: build with the -fstack-protector CFLAG to gain us some protection from accidental stack smashing during the 64 bit conversion.  Not a magic fix, but it makes errors more obvious.

details:	http://hg.adium.im/adium/rev/ae5b6a36fda5
revision:	2691:ae5b6a36fda5
author:		Stephen Holt <sholt at adium.im>
date:		Sun Sep 06 20:48:51 2009 -0400

build with the -fstack-protector CFLAG to gain us some protection from accidental stack smashing during the 64 bit conversion.  Not a magic fix, but it makes errors more obvious.

diffs (84 lines):

diff -r a779f1e623a9 -r ae5b6a36fda5 Dependencies/build.sh
--- a/Dependencies/build.sh	Sun Sep 06 14:53:09 2009 -0400
+++ b/Dependencies/build.sh	Sun Sep 06 20:48:51 2009 -0400
@@ -21,7 +21,7 @@
 NUMBER_OF_CORES=`sysctl -n hw.activecpu`
 SDK_ROOT="/Developer/SDKs/MacOSX10.5.sdk"
 MIN_OS_VERSION="10.5"
-BASE_CFLAGS="-isysroot $SDK_ROOT \
+BASE_CFLAGS="-fstack-protector -isysroot $SDK_ROOT \
 	-mmacosx-version-min=$MIN_OS_VERSION \
 	-I$ROOTDIR/build/include \
 	-L$ROOTDIR/build/lib"
@@ -91,9 +91,6 @@
 			asserttools "/Developer/usr/bin/llvm-gcc"
 			export CC="/Developer/usr/bin/llvm-gcc"
 			export CXX="/Developer/usr/bin/llvm-g++"
-			BASE_CFLAGS="-I$ROOTDIR/build/include -L$ROOTDIR/build/lib"
-			BASE_LDFLAGS="-Wl,-headerpad_max_install_names \
-				-I$ROOTDIR/build/include -L$ROOTDIR/build/lib"
 			warning "Building with LLVM! This is unsupported and will probably break things!"
 			;;
 		--libpurple-rev=*)
@@ -129,8 +126,10 @@
 
 # this file contans the stdio and stderr of the most recent build
 LOG_FILE="${ROOTDIR}/build.log"
+ERR_FILE="${ROOTDIR}/error.log"
 
 : > ${LOG_FILE}
+: > ${ERR_FILE}
 
 # set -arch flags now, after the user has had a chance to diasble one or more
 set_arch_flags
diff -r a779f1e623a9 -r ae5b6a36fda5 Dependencies/phases/build_dependencies.sh
--- a/Dependencies/phases/build_dependencies.sh	Sun Sep 06 14:53:09 2009 -0400
+++ b/Dependencies/phases/build_dependencies.sh	Sun Sep 06 20:48:51 2009 -0400
@@ -39,14 +39,16 @@
 	if needsconfigure $@; then
 	(
 		status "Configuring gettext"
-		export CFLAGS="$ARCH_CFLAGS"
-		export LDFLAGS="$ARCH_LDFLAGS"
-		log ./configure \
-				--prefix="$ROOTDIR/build" \
+		CONFIG_CMD="./configure \
+				--prefix=$ROOTDIR/build \
 				--disable-java \
 				--disable-static \
 				--enable-shared \
-				--disable-dependency-tracking
+				--disable-dependency-tracking"
+		xconfigure "${BASE_CFLAGS}" "${BASE_LDFLAGS}" "${CONFIG_CMD}" \
+			"${ROOTDIR}/source/gettext/gettext-runtime/config.h" \
+			"${ROOTDIR}/source/gettext/gettext-runtime/libasprintf/config.h" \
+			"${ROOTDIR}/source/gettext/gettext-tools/config.h"
 	)
 	fi
 	
diff -r a779f1e623a9 -r ae5b6a36fda5 Dependencies/phases/utility.sh
--- a/Dependencies/phases/utility.sh	Sun Sep 06 14:53:09 2009 -0400
+++ b/Dependencies/phases/utility.sh	Sun Sep 06 20:48:51 2009 -0400
@@ -32,11 +32,11 @@
 
 Running command:
 	${localPWD}/${@:1}
-" >> ${LOG_FILE}
+" >> ${LOG_FILE} >> ${ERR_FILE}
 
 	(
 		${@:1}
-	) >> ${LOG_FILE} 2>&1
+	) >> ${LOG_FILE} 2>> ${ERR_FILE}
 }
 
 ##
@@ -342,7 +342,7 @@
 		(
 		export CFLAGS="${1} -arch ${ARCHS[i]}"
 		export LDFLAGS="${2} -arch ${ARCHS[i]}"
-		CONFIG_CMD="${3} --host=${HOSTS[i]}"
+		CONFIG_CMD="${3} --host=${HOSTS[i]} --build=${HOSTS[i]}"
 		log ${CONFIG_CMD}
 		)
 		#only do this for more than 1 arch