make.sh: Fix typo in variable name COMPILERCACHE -> COMPILERCHECK

[ipfire-2.x.git] / tools / make-functions

diff --git a/tools/make-functions b/tools/make-functions
index a50538e9dc11ec3139321e9a4523f230a0256efa..a9baab96d50257230fcf75d5fbe21122f100898e 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -68,14 +68,20 @@ configure_target() {
        fi
 
        case "${target_arch}" in
+               x86_64)
+                       BUILDTARGET="${target_arch}-unknown-linux-gnu"
+                       CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu"
+                       CFLAGS_ARCH="-m64 -mtune=generic"
+                       ;;
+
                i586)
-                       BUILDTARGET="${TARGET_ARCH}-pc-linux-gnu"
+                       BUILDTARGET="${target_arch}-pc-linux-gnu"
                        CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu"
-                       CFLAGS_ARCH="-march=i586 -fomit-frame-pointer"
+                       CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
                        ;;
 
                armv5tel)
-                       BUILDTARGET="${TARGET_ARCH}-unknown-linux-gnueabi"
+                       BUILDTARGET="${target_arch}-unknown-linux-gnueabi"
                        CROSSTARGET="${BUILD_ARCH}-cross-linux-gnueabi"
                        CFLAGS_ARCH="-march=armv5te -mfloat-abi=soft -fomit-frame-pointer"
                        MACHINE_TYPE="arm"
@@ -105,8 +111,6 @@ configure_target() {
        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}"
 }
 
 configure_target_guess() {
@@ -446,20 +450,19 @@ entershell() {
        qemu_install_helper
 
        echo "Entering to a shell inside LFS chroot, go out with exit"
-       chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
+       chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='ipfire build chroot ($(uname -m)) \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" \
+               CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
                CCACHE_DIR=/usr/src/ccache \
-               CCACHE_COMPRESS=1 \
-               CCACHE_COMPILERCHECK="none" \
+               CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
+               CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
                KVER=$KVER \
                BUILDTARGET="$BUILDTARGET" \
                CROSSTARGET="${CROSSTARGET}" \
                MACHINE="$MACHINE" \
                MACHINE_TYPE="$MACHINE_TYPE" \
-               KGCC="ccache /usr/bin/gcc" \
                $(fake_environ) \
                $(qemu_environ) \
                /tools/bin/bash -i
@@ -575,9 +578,10 @@ lfsmake2() {
                                                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" \
+                                               CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+                                               CCACHE_DIR=/usr/src/ccache \
+                                               CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
+                                               CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
                                                KVER=$KVER MAKETUNING=$MAKETUNING \
                                                BUILDTARGET="$BUILDTARGET" \
                                                CROSSTARGET="${CROSSTARGET}" \
@@ -616,9 +620,10 @@ ipfiremake() {
                                                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" \
+                                               CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+                                               CCACHE_DIR=/usr/src/ccache \
+                                               CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
+                                               CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
                                                KVER=$KVER MAKETUNING=$MAKETUNING \
                                                BUILDTARGET="$BUILDTARGET" \
                                                CROSSTARGET="${CROSSTARGET}" \
@@ -655,9 +660,10 @@ ipfiredist() {
                                        VERSION=$VERSION \
                                        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" \
+                                       CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+                                       CCACHE_DIR=/usr/src/ccache \
+                                       CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
+                                       CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
                                        KVER=$KVER \
                                        BUILDTARGET="$BUILDTARGET" \
                                        CROSSTARGET="${CROSSTARGET}" \
@@ -695,7 +701,7 @@ installmake() {
                                                SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
                                                CONFIG_ROOT=$CONFIG_ROOT \
                                                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
-                                               CFLAGS="-Os" CXXFLAGS="-Os" \
+                                               CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
                                                CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
                                                KVER=$KVER \
                                                BUILDTARGET="$BUILDTARGET" \
@@ -729,6 +735,7 @@ update_langs() {
                $BASEDIR/tools/sort_strings.pl ru
                $BASEDIR/tools/sort_strings.pl nl
                $BASEDIR/tools/sort_strings.pl tr
+               $BASEDIR/tools/sort_strings.pl it
                $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
@@ -737,6 +744,22 @@ update_langs() {
                $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_strings.pl it > $BASEDIR/doc/language_issues.it
                $BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings
                beautify message DONE
+
+               echo -ne "Updating language lists..."
+               update_language_list ${BASEDIR}/src/installer/po
+               update_language_list ${BASEDIR}/src/setup/po
+               beautify message DONE
+}
+
+update_language_list() {
+       local path="${1}"
+
+       local lang
+       for lang in ${path}/*.po; do
+               lang="$(basename "${lang}")"
+               echo "${lang%*.po}"
+       done | sort -u > "${path}/LINGUAS"
 }