X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=tools%2Fmake-functions;h=48fc6d434dd5ef0e7c5535800f73df6d383edb8a;hp=0753865f51e05a36ed1cf65416ee399d70b2aacf;hb=3e5e8a4a88727c3ab3871fa683b97beb0e307684;hpb=ad92a4b8ad4ed5a434abff422ceefae3d8f368d1

diff --git a/tools/make-functions b/tools/make-functions
index 0753865f5..48fc6d434 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -220,25 +220,27 @@ get_pkg_ver()
 if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE ]; then
 	echo "`date -u '+%b %e %T'`: Machine is iX86 (or equivalent)" >> $LOGFILE
 	MACHINE=i586
+	CROSSTARGET=${MACHINE}-cross-linux-gnu
 	BUILDTARGET=i586-pc-linux-gnu
-	CFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer"
-	CXXFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer"
-	C2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer"
-	CXX2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer"
-elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE -o 'armv7l' = $MACHINE ]; then
+	CFLAGS_ARCH="${GLOBAL_CFLAGS} -march=i586 -fomit-frame-pointer"
+elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE -o 'armv6l' = $MACHINE -o 'armv7l' = $MACHINE ]; then
 	echo "`date -u '+%b %e %T'`: Machine is ARM (or equivalent)" >> $LOGFILE
 	MACHINE=armv5tel
 	MACHINE_TYPE=arm
+	CROSSTARGET=${MACHINE}-cross-linux-gnueabi
 	BUILDTARGET=${MACHINE}-unknown-linux-gnueabi
-	CFLAGS="-O2 -march=armv5te -mfloat-abi=soft -fomit-frame-pointer -pipe"
-	CXXFLAGS="$CFLAGS"
-	C2FLAGS="$CFLAGS"
-	CXX2FLAGS="$CXXFLAGS"
+	CFLAGS_ARCH="-march=armv5te -mfloat-abi=soft -fomit-frame-pointer"
 else
 	echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE"
 	exit 1
 fi
 
+CFLAGS="-O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fPIC"
+CFLAGS="${CFLAGS} -fstack-protector-all --param=ssp-buffer-size=4 ${CFLAGS_ARCH}"
+CXXFLAGS="${CFLAGS}"
+C2FLAGS="${CFLAGS}"
+CXX2FLAGS="${CXXFLAGS}"
+
 # Define immediately
 stdumount() {
 	umount $BASEDIR/build/sys			2>/dev/null;
@@ -291,8 +293,8 @@ entershell() {
 	fi
 
 	echo "Entering to a shell inside LFS chroot, go out with exit"
-	$linux32 chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
-		PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
+	chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
+		PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
 		VERSION=$VERSION CONFIG_ROOT=$CONFIG_ROOT \
 		NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
 		CFLAGS="$CF2LAGS" CXXFLAGS="$CXX2FLAGS" \
@@ -301,6 +303,7 @@ entershell() {
 		CCACHE_COMPILERCHECK="none" \
 		KVER=$KVER \
 		BUILDTARGET="$BUILDTARGET" \
+		CROSSTARGET="${CROSSTARGET}" \
 		MACHINE="$MACHINE" \
 		MACHINE_TYPE="$MACHINE_TYPE" \
 		KGCC="ccache /usr/bin/gcc" \
@@ -382,13 +385,13 @@ lfsmake1() {
 	local PKG_TIME_START=`date +%s`
 
 	cd $BASEDIR/lfs && make -f $* 	BUILDTARGET=$BUILDTARGET \
+						CROSSTARGET="${CROSSTARGET}" \
 						MACHINE=$MACHINE \
 						MACHINE_TYPE=$MACHINE_TYPE \
 						LFS_BASEDIR=$BASEDIR \
 						ROOT=$LFS \
 						KVER=$KVER \
 						MAKETUNING=$MAKETUNING \
-						$(fake_environ) \
 						install >> $LOGFILE 2>&1
 	local COMPILE_SUCCESS=$?
 	local PKG_TIME_END=`date +%s`
@@ -408,17 +411,20 @@ lfsmake2() {
 	[ $? == 1 ] && return 0
 
 	local PKG_TIME_START=`date +%s`
-	$linux32 chroot $LFS /tools/bin/env -i 	HOME=/root \
+	chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
-						PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
-						VERSION=$VERSION \
+						PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
+						VERSION=$VERSION PAKFIRE_CORE="${PAKFIRE_CORE}" \
+						SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
 						CONFIG_ROOT=$CONFIG_ROOT \
 						NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
 						CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
 						CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
 						CCACHE_COMPILERCHECK="none" \
 						KVER=$KVER MAKETUNING=$MAKETUNING \
-						BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
+						BUILDTARGET="$BUILDTARGET" \
+						CROSSTARGET="${CROSSTARGET}" \
+						MACHINE="$MACHINE" \
 						MACHINE_TYPE="$MACHINE_TYPE" \
 						$(fake_environ) \
 						/tools/bin/bash -x -c "cd /usr/src/lfs && \
@@ -441,18 +447,21 @@ ipfiremake() {
 	[ $? == 1 ] && return 0
 
 	local PKG_TIME_START=`date +%s`
-	$linux32 chroot $LFS /tools/bin/env -i 	HOME=/root \
+	chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
-						PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
+						PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
 						VERSION=$VERSION \
 						CORE=$CORE \
 						CONFIG_ROOT=$CONFIG_ROOT \
 						NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
+						SYSTEM_RELEASE="$SYSTEM_RELEASE" \
 						CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
 						CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
 						CCACHE_COMPILERCHECK="none" \
 						KVER=$KVER MAKETUNING=$MAKETUNING \
-						BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
+						BUILDTARGET="$BUILDTARGET" \
+						CROSSTARGET="${CROSSTARGET}" \
+						MACHINE="$MACHINE" \
 						MACHINE_TYPE="$MACHINE_TYPE" \
 						$(fake_environ) \
 						/bin/bash -x -c "cd /usr/src/lfs && \
@@ -477,7 +486,7 @@ ipfiredist() {
 	local PKG_TIME_START=`date +%s`
 	chroot $LFS /tools/bin/env -i 	HOME=/root \
 					TERM=$TERM PS1='\u:\w\$ ' \
-					PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
+					PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
 					VERSION=$VERSION \
 					CONFIG_ROOT=$CONFIG_ROOT \
 					NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
@@ -485,7 +494,9 @@ ipfiredist() {
 					CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
 					CCACHE_COMPILERCHECK="none" \
 					KVER=$KVER \
-					BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
+					BUILDTARGET="$BUILDTARGET" \
+					CROSSTARGET="${CROSSTARGET}" \
+					MACHINE="$MACHINE" \
 					MACHINE_TYPE="$MACHINE_TYPE" \
 					$(fake_environ) \
 					/bin/bash -x -c "cd /usr/src/lfs && \
@@ -508,20 +519,23 @@ installmake() {
 	[ $? == 1 ] && return 0
 
 	local PKG_TIME_START=`date +%s`
-	$linux32 chroot $LFS /tools/bin/env -i 	HOME=/root \
+	chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
-						PATH=/opt/i586-uClibc/i586-linux-uclibc/bin:/opt/i586-uClibc/bin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
+						PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
 						VERSION=$VERSION \
+						SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
 						CONFIG_ROOT=$CONFIG_ROOT \
-						LFS_PASS="install" \
 						NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
 						CFLAGS="-Os" CXXFLAGS="-Os" \
 						CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
 						KVER=$KVER \
-						BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
+						BUILDTARGET="$BUILDTARGET" \
+						CROSSTARGET="${CROSSTARGET}" \
+						MACHINE="$MACHINE" \
 						MACHINE_TYPE="$MACHINE_TYPE" \
-		    /bin/bash -x -c "cd /usr/src/lfs && \
-		    make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1
+						LD_LIBRARY_PATH=/tools/lib \
+		    /tools/bin/bash -x -c "cd /usr/src/lfs && \
+		    /tools/bin/make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1
 
 	local COMPILE_SUCCESS=$?
 	local PKG_TIME_END=`date +%s`
@@ -544,12 +558,16 @@ update_langs() {
 		$BASEDIR/tools/sort_strings.pl es
 		$BASEDIR/tools/sort_strings.pl pl
 		$BASEDIR/tools/sort_strings.pl ru
+		$BASEDIR/tools/sort_strings.pl nl
+		$BASEDIR/tools/sort_strings.pl tr
 		$BASEDIR/tools/check_strings.pl en > $BASEDIR/doc/language_issues.en
 		$BASEDIR/tools/check_strings.pl de > $BASEDIR/doc/language_issues.de
 		$BASEDIR/tools/check_strings.pl fr > $BASEDIR/doc/language_issues.fr
 		$BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.es
 		$BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.pl
 		$BASEDIR/tools/check_strings.pl ru > $BASEDIR/doc/language_issues.ru
+		$BASEDIR/tools/check_strings.pl nl > $BASEDIR/doc/language_issues.nl
+		$BASEDIR/tools/check_strings.pl tr > $BASEDIR/doc/language_issues.tr
 		$BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings
 		beautify message DONE
 }