X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=tools%2Fmake-functions;h=48fc6d434dd5ef0e7c5535800f73df6d383edb8a;hp=5af0b4b8472d474d4dde7688207a9f49808ac0e8;hb=055ed1ffc99100f7c209aa96f1787325be9063c8;hpb=41cfd9e04b1a06d242432e682ab5601f933c0e21

diff --git a/tools/make-functions b/tools/make-functions
index 5af0b4b84..48fc6d434 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -222,25 +222,25 @@ if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE ]; then
 	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"
+	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;
@@ -414,7 +414,8 @@ lfsmake2() {
 	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 \
+						VERSION=$VERSION PAKFIRE_CORE="${PAKFIRE_CORE}" \
+						SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
 						CONFIG_ROOT=$CONFIG_ROOT \
 						NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
 						CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
@@ -453,6 +454,7 @@ ipfiremake() {
 						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" \
@@ -521,6 +523,7 @@ installmake() {
 						TERM=$TERM PS1='\u:\w\$ ' \
 						PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
 						VERSION=$VERSION \
+						SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
 						CONFIG_ROOT=$CONFIG_ROOT \
 						NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
 						CFLAGS="-Os" CXXFLAGS="-Os" \
@@ -555,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
 }