Binutilserror behoben.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@303 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/lfs/binutils b/lfs/binutils
index 2b92d78db33dda5dcf243e5725eff96ad86f8a0f..8ddbc96b1913674cf31ad90bfbf5b6580005f243 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -38,8 +38,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls

-  EXTRA_MAKE = tooldir=/usr
-  EXTRA_INSTALL = tooldir=/usr
+  EXTRA_MAKE = tooldir=/usr LD_LIBRARY_PATH=/usr/lib
+  EXTRA_INSTALL = tooldir=/usr LD_LIBRARY_PATH=/usr/lib

 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1


@@ -96,10 +96,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
 ifeq "$(PASS)" "1"
        cd $(DIR_SRC)/binutils-build && make configure-host
        cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
 ifeq "$(PASS)" "1"
        cd $(DIR_SRC)/binutils-build && make configure-host

-#      cd $(DIR_SRC)/binutils-build && make $(MAKETUNING)
-#      cd $(DIR_SRC)/binutils-build && make clean

 endif
 endif

-       cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) #$(MAKETUNING)
+       # $(MAKETUNING) stil is disabled here
+       cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) 

        cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
        cd $(DIR_APP)/binutils-build && cp -v ../$(THISAPP)/include/libiberty.h /usr/include
        cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
        cd $(DIR_APP)/binutils-build && cp -v ../$(THISAPP)/include/libiberty.h /usr/include

diff --git a/make.sh b/make.sh
index c20f82c301b6f395066c95e701ffbe237588524d..dc07e006b2b72d2aba7b282b3598a8097cb26268 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -678,6 +678,7 @@ ipfirepackages() {
 # See what we're supposed to do
 case "$1" in 
 build)
 # See what we're supposed to do
 case "$1" in 
 build)

+       clear

        BUILDMACHINE=`uname -m`
        PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
        #only restore on a clean disk
        BUILDMACHINE=`uname -m`
        PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
        #only restore on a clean disk


@@ -697,7 +698,8 @@ build)
                        fi
                fi
        else
                        fi
                fi
        else

-               echo "`date -u '+%b %e %T'`: Using installed toolchain" | tee -a $LOGFILE
+               echo -n "Using installed toolchain" | tee -a $LOGFILE
+               beautify message SKIP

                prepareenv
        fi
 
                prepareenv
        fi
 


@@ -855,6 +857,7 @@ prefetch)
        cd - >/dev/null 2>&1
        ;;
 toolchain)
        cd - >/dev/null 2>&1
        ;;
 toolchain)

+       clear

        prepareenv
        beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
        buildtoolchain
        prepareenv
        beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
        buildtoolchain


@@ -956,9 +959,9 @@ svn)
                        exit 0
                fi
                echo -en "REV $SVN_REVISION: Downloading..."
                        exit 0
                fi
                echo -en "REV $SVN_REVISION: Downloading..."

-               svn export http://svn.ipfire.eu/svn/ipfire ipfire-source/ --force > /dev/null
-               svn log http://svn.ipfire.eu/svn/ipfire -r 1:$SVN_REVISION > ipfire-source/Changelog
-               #svn info http://svn.ipfire.eu/svn/ipfire -r $SVN_REVISION > ipfire-source/svn_status
+               svn export http://svn.ipfire.eu/svn/ipfire/trunk ipfire-source/ --force > /dev/null
+               svn log http://svn.ipfire.eu/svn/ipfire/trunk -r 1:$SVN_REVISION > ipfire-source/Changelog
+               #svn info http://svn.ipfire.eu/svn/ipfire/trunk -r $SVN_REVISION > ipfire-source/svn_status

                evaluate 1
 
                echo -en "REV $SVN_REVISION: Compressing files..."
                evaluate 1
 
                echo -en "REV $SVN_REVISION: Compressing files..."