X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgcc;h=1f9021c05be0c208a3ef389641fd096a5048657b;hb=3731c3daa75962346a6b2901c25c9f012f177c44;hp=868428c6207223b9f57286fac8648076358fde27;hpb=bc9f0c12b34a44aafe025e7de29c8de7d2d9c848;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/lfs/gcc b/lfs/gcc index 868428c620..1f9021c05b 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -1,22 +1,20 @@ ############################################################################### -# This file is part of the IPCop Firewall. # # # -# IPCop is free software; you can redistribute it and/or modify # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # +# the Free Software Foundation, either version 3 of the License, or # # (at your option) any later version. # # # -# IPCop is distributed in the hope that it will be useful, # +# This program is distributed in the hope that it will be useful, # # but WITHOUT ANY WARRANTY; without even the implied warranty of # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # GNU General Public License for more details. # # # # You should have received a copy of the GNU General Public License # -# along with IPCop; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Makefiles are based on LFSMake, which is # -# Copyright (C) 2002 Rod Roard # +# along with this program. If not, see . # # # ############################################################################### @@ -26,7 +24,7 @@ include Config -VER = 4.0.3 +VER = 4.0.4 THISAPP = gcc-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -34,38 +32,56 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = +TARGET_PATH = /opt/$(MACHINE)-uClibc/bin:$(PATH) # Normal build or /tools build. # ifeq "$(ROOT)" "" ifeq "$(INST)" "1" TARGET = $(DIR_INFO)/$(THISAPP)-install1 - EXTRA_CONFIG = --target=$(MACHINE)-linux-uclibc --prefix=/opt/$(MACHINE)-uClibc \ - --with-local-prefix=/opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc --with-newlib \ - --with-sysroot=/opt/$(MACHINE)-uClibc --disable-nls \ - --enable-threads=no --enable-symvers=gnu \ - --disable-__cxa_atexit --enable-languages=c \ - --disable-shared --with-gnu-as --with-gnu-ld \ - --without-headers + EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \ + --build=$(MACHINE)-pc-linux-gnu \ + --host=$(MACHINE)-pc-linux-gnu \ + --target=$(MACHINE)-linux-uclibc \ + --enable-languages=c \ + --with-sysroot=$(DIR_SRC)/uClibc_dev \ + --disable-__cxa_atexit \ + --enable-target-optspace \ + --with-gnu-ld \ + --disable-shared \ + --enable-threads \ + --enable-multilib \ + --disable-nls + EXTRA_MAKE = + EXTRA_INSTALL = else ifeq "$(INST)" "2" TARGET = $(DIR_INFO)/$(THISAPP)-install2 - EXTRA_CONFIG = --target=$(MACHINE)-linux-uclibc --prefix=/opt/$(MACHINE)-uClibc \ - --with-local-prefix=/opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc \ - --with-sysroot=/opt/$(MACHINE)-uClibc \ - --disable-nls \ - --enable-threads=posix --enable-symvers=gnu \ - --disable-__cxa_atexit --enable-languages=c,c++ \ - --enable-c99 --enable-long-long --with-gnu-as \ - --with-gnu-ld --enable-shared --enable-clocale \ - --enable-target-optspace + EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \ + --build=$(MACHINE)-pc-linux-gnu \ + --host=$(MACHINE)-pc-linux-gnu \ + --target=$(MACHINE)-linux-uclibc \ + --enable-languages=c,c++ \ + --with-sysroot=$(DIR_SRC)/uClibc_dev \ + --disable-__cxa_atexit \ + --enable-target-optspace \ + --with-gnu-ld \ + --enable-shared \ + --disable-nls \ + --enable-threads \ + --enable-multilib + EXTRA_MAKE = + EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP) EXTRA_CONFIG = --prefix=/usr \ - --libexecdir=/usr/lib --enable-shared \ - --enable-threads=posix --enable-__cxa_atexit \ - --enable-clocale=gnu --enable-languages=c,c++ \ - --disable-nls + --libexecdir=/usr/lib \ + --enable-shared \ + --enable-threads=posix \ + --enable-__cxa_atexit \ + --enable-clocale=gnu \ + --enable-languages=c,c++ \ + --disable-nls EXTRA_MAKE = EXTRA_INSTALL = endif @@ -74,17 +90,22 @@ else ifeq "$(PASS)" "1" TARGET = $(DIR_INFO)/$(THISAPP)-tools1 EXTRA_CONFIG = --prefix=/tools \ - --with-local-prefix=/tools --disable-nls --enable-shared \ - --enable-languages=c + --with-local-prefix=/tools \ + --disable-nls \ + --enable-shared \ + --enable-languages=c EXTRA_MAKE = bootstrap BOOT_LDFLAGS="-static" EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools2 EXTRA_CONFIG = --prefix=/tools \ - --with-local-prefix=/tools --enable-clocale=gnu \ - --enable-shared --enable-threads=posix \ - --enable-__cxa_atexit --enable-languages=c,c++ \ - --disable-libstdcxx-pch + --with-local-prefix=/tools \ + --enable-clocale=gnu \ + --enable-shared \ + --enable-threads=posix \ + --enable-__cxa_atexit \ + --enable-languages=c,c++ \ + --disable-libstdcxx-pch EXTRA_MAKE = EXTRA_INSTALL = endif @@ -97,7 +118,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6ff1af12c53cbb3f79b27f2d6a9a3d50 +$(DL_FILE)_MD5 = 8970debbc55bea85ee80961d733080f0 install : $(TARGET) @@ -127,21 +148,29 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) +# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-pr28045.patch @mkdir $(DIR_SRC)/gcc-build ifeq "$(ROOT)" "" ifeq "$(INST)" "1" cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-conf.patch cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG) -override PATH = /opt/$(MACHINE)-uClibc/bin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin - cd $(DIR_SRC)/gcc-build && make all-gcc install-gcc + cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make $(MAKETUNING) all-gcc + cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make install-gcc + cd /opt/$(MACHINE)-uClibc/bin && for i in `ls -w1 $(MACHINE)-linux-uclibc-*`; do \ + ln -svf $$i $(MACHINE)-linux-`echo $$i | cut -c 19-`; \ + done + ln -svf $(MACHINE)-linux-uclibc /opt/$(MACHINE)-uClibc/$(MACHINE)-linux + ln -svf gcc /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/bin/cc else ifeq "$(INST)" "2" cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-conf.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-locale.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-libstdc++-pic.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-sdk-libstdc++-includes.patch + ln -snf ../include /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/sys-include cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG) - cd $(DIR_SRC)/gcc-build && make all install + cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make install $(EXTRA_INSTALL) cp -f /opt/$(MACHINE)-uClibc/lib/libgcc_s.so /lib cd /lib && ln -sf libgcc_s.so libgcc_s.so.1 else