Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...

diff --git a/lfs/binutils b/lfs/binutils
index 104a2a7f89dba3b5623858f0b8ee91c8eb73a1d9..9f687ad561488f3f2ca3c2979986e7c71c64e462 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -43,6 +43,7 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL = tooldir=/usr
 else
 ifeq "$(PASS)" "1"
+  CFLAGS := $(patsubst -march=%,,$(CFLAGS))
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
        --target=$(CROSSTARGET) \

diff --git a/lfs/ccache b/lfs/ccache
index 22b8c5e0b39d50c6d84cb13c291ff1c3176250fe..454032d0e1ee902127799b767b6d93cc29f643ab 100644 (file)
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
 
 ifeq "$(PASS)" "1"
-       CFLAGS += -static
+       CFLAGS := $(patsubst -march=%,,$(CFLAGS)) -static
 endif
 
 # Set max cache size to 5GB

diff --git a/lfs/fake-environ b/lfs/fake-environ
index b724912538d1ea0e20b282a491feba06b1edebdf..978a90d9bc9c0db1e1250d514d07f9203ca237cf 100644 (file)
--- a/lfs/fake-environ
+++ b/lfs/fake-environ
@@ -28,7 +28,7 @@ VER = 1.0
 
 THISAPP    = fake-environ
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)-tools$(PASS)
+TARGET     = $(DIR_INFO)/$(THISAPP)-tools
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/gcc b/lfs/gcc
index 82e0d915d0c1ed3ee9c8ffefa9b3adacbc05a64c..c8bcb08f27a4cda89eabe4a5c7ff835e857c1f60 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -52,6 +52,7 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL =
 else
 ifeq "$(PASS)" "1"
+  CFLAGS := $(patsubst -march=%,,$(CFLAGS))
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
        --target=$(CROSSTARGET) \

diff --git a/lfs/glibc b/lfs/glibc
index 70ae0df94c11466e5d1c8c933c09723a41a86172..f2553e98af27160280d0f9798d6f2d0461de87d8 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -57,14 +57,13 @@ else
 endif
 
 # Enable some extra optimization for the glibc code.
-export CFLAGS := -O3 -DNDEBUG -fasynchronous-unwind-tables -fPIC -DPIC \
+CFLAGS = -O3 -DNDEBUG -fasynchronous-unwind-tables -fPIC -DPIC \
        -DNO_CTORS_DTORS_SECTIONS
 
 ifeq "$(MACHINE)" "i586"
        CFLAGS += -march=i586 -mtune=generic -mno-tls-direct-seg-refs
 endif
 
-
 ifeq "$(MACHINE_TYPE)" "arm"
        # Disable hardware FP for ARM.
        EXTRA_CONFIG += \
@@ -260,7 +259,7 @@ endif
                CFLAGS="$(CFLAGS) -fno-asynchronous-unwind-tables" \
                $(DIR_APP)/configure $(EXTRA_CONFIG)
        cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
-               CFLAFS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+               CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
        cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
 
 ifeq "$(ROOT)" ""

diff --git a/make.sh b/make.sh
index b79e8e8df68bc020a2fc5f4e3237e0bb30f4f4a5..c62e748d003ed5c1ca653f606a2429848ada1a62 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -232,7 +232,7 @@ buildtoolchain() {
     local error=false
     case "${MACHINE}:$(uname -m)" in
         # x86
-        i586:i586|i586:i686)
+        i586:i586|i586:i686|i586:x86_64)
             # These are working.
             ;;
         i586:*)
@@ -251,16 +251,9 @@ buildtoolchain() {
     ${error} && \
         exiterror "Cannot build ${MACHINE} toolchain on $(uname -m). Please use the download if any."
 
-    if [ "$(uname -r | grep ipfire)" ]; then
-        exiterror "Cannot build toolchain on ipfire. Please use the download."
-    fi
-
-    if [ ! -e /usr/include/asm -o ! -e /usr/include/bits -o ! -e /usr/include/gnu -o ! -e /usr/include/sys ]; then
-        exiterror "Cannot build toolchain without (asm, bits, gnu or sys includes). Please fix or use the download."
-    fi
-
-    if [ ! -e /usr/lib/libc.so ]; then
-        exiterror "Cannot build toolchain without (/usr/lib/libc.so). Please fix or use the download."
+    local gcc=$(type -p gcc)
+    if [ -z "${gcc}" ]; then
+        exiterror "Could not find GCC. You will need a working build enviroment in order to build the toolchain."
     fi
 
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
@@ -268,7 +261,6 @@ buildtoolchain() {
 
     local ORG_PATH=$PATH
     export PATH="/tools/ccache/bin:/tools/bin:$PATH"
-    lfsmake1 fake-environ              PASS=1
     lfsmake1 ccache                    PASS=1
     lfsmake1 binutils                  PASS=1
     lfsmake1 gcc                       PASS=1
@@ -277,7 +269,6 @@ buildtoolchain() {
     lfsmake1 cleanup-toolchain         PASS=1
     lfsmake1 binutils                  PASS=2
     lfsmake1 gcc                       PASS=2
-    lfsmake1 fake-environ              PASS=2
     lfsmake1 ccache                    PASS=2
     lfsmake1 tcl
     lfsmake1 expect
@@ -299,6 +290,7 @@ buildtoolchain() {
     lfsmake1 sed
     lfsmake1 tar
     lfsmake1 texinfo
+    lfsmake1 fake-environ
     lfsmake1 cleanup-toolchain         PASS=2
     export PATH=$ORG_PATH
 }