Installer-Toolchain nochmals ueberarbeitet.

[people/teissler/ipfire-2.x.git] / lfs / binutils

diff --git a/lfs/binutils b/lfs/binutils
index 484e4350a741830b01a25f86408775434131437d..2102980a7ce85258f2444d4c93873b2790b19c30 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#         Modified Makefile for IPCop build                                   #
-#                                                                             #
-# $Id: binutils,v 1.4.2.3 2005/02/05 15:38:14 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,29 +26,42 @@
 
 include Config
 
-VER        = 2.15.90.0.3
+VER        = 2.16.1
 
 THISAPP    = binutils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_KERNEL)/linux/devel/binutils
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
+ifeq "$(LFS_PASS)" "install"
+  TARGET = $(DIR_INFO)/$(THISAPP)-install
+  EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \
+               --build=$(MACHINE)-pc-linux-gnu \
+               --host=$(MACHINE)-pc-linux-gnu \
+               --target=$(MACHINE)-linux-uclibc \
+               --disable-nls \
+               --enable-multilib \
+               --disable-werror
+  EXTRA_MAKE = all
+  EXTRA_INSTALL = 
+else
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
+  EXTRA_MAKE = tooldir=/usr
+  EXTRA_INSTALL = tooldir=/usr
+endif
 else
-ifeq "$(LFS_PASS)" "1"
+ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = --prefix=/tools --disable-nls
   EXTRA_MAKE = LDFLAGS="-all-static"
   EXTRA_INSTALL = 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
-  EXTRA_CONFIG = --prefix=/tools --enable-shared --with-lib-path=/tools/lib --disable-nls
+  EXTRA_CONFIG = --prefix=/tools --with-lib-path=/tools/lib --disable-nls
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
@@ -68,7 +75,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1c1af0064ebd3d7bd99905874656a21e
+$(DL_FILE)_MD5 = 6a9d529efb285071dad10e1f3d2b2967
 
 install : $(TARGET)
 
@@ -99,16 +106,30 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/binutils-build
+ifeq "$(LFS_PASS)" "install"
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/binutils-uclibc-conf.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/binutils-uclibc-libtool-conf.patch
+endif
        cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-ifeq "$(ROOT)" ""
-       cd $(DIR_SRC)/binutils-build && make -j 3 $(EXTRA_MAKE)
-       cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
-else
-ifeq "$(LFS_PASS)" "1"
+ifeq "$(PASS)" "1"
        cd $(DIR_SRC)/binutils-build && make configure-host
 endif
-       cd $(DIR_SRC)/binutils-build && make -j 3 $(EXTRA_MAKE)
+       cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING)
        cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
+ifeq "$(ROOT)" ""
+ifneq "$(LFS_PASS)" "install"
+       cp -v $(DIR_APP)/include/libiberty.h /usr/include
+endif
+else
+ifeq "$(PASS)" "1"
+       cd $(DIR_SRC)/binutils-build && make -C ld clean
+       cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/tools/lib
+       cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
+else
+       cd $(DIR_SRC)/binutils-build && make -C ld clean
+       cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib
+       cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
+endif
 endif
        @rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build
        @$(POSTBUILD)