]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - lfs/gcc
Merge commit 'ms/openvpn-n2n' into next
[people/teissler/ipfire-2.x.git] / lfs / gcc
diff --git a/lfs/gcc b/lfs/gcc
index c7e227007c242e1bce77f5e9266882d644e47398..af87e21164eff2f8935c1751af1db5fafaa00ba8 100644 (file)
--- 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-2011  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# 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 <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 4.0.3
+VER        = 4.1.2
 
 THISAPP    = gcc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -34,47 +32,10 @@ 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 = --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 = --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 \
@@ -86,8 +47,6 @@ else
                --disable-nls
   EXTRA_MAKE =
   EXTRA_INSTALL =
-endif
-endif
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
@@ -96,7 +55,8 @@ ifeq "$(PASS)" "1"
                --disable-nls \
                --enable-shared \
                --enable-languages=c
-  EXTRA_MAKE = bootstrap BOOT_LDFLAGS="-static"
+  EXTRA_MAKE = bootstrap
+  # BOOT_LDFLAGS="-static"
   EXTRA_INSTALL = 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
@@ -120,7 +80,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6ff1af12c53cbb3f79b27f2d6a9a3d50
+$(DL_FILE)_MD5 = a4a3eb15c96030906d8494959eeda23c
 
 install : $(TARGET)
 
@@ -150,31 +110,9 @@ $(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/$(THISAPP)-fix_linker_version_detection.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)
-       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 && 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
        cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
        cd $(DIR_APP) && sed -i 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in
        cd $(DIR_APP) && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
@@ -185,8 +123,6 @@ else
        cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
        ln -sfv ../usr/bin/cpp /lib
        ln -sfv gcc /usr/bin/cc
-endif
-endif
 else
 ifeq "$(PASS)" "1"
        cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)