webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Zwischencommit fuer LFS. GCC und Binutils fixed.

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@304 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-10-06 09:08:18 +00:00
parent 9729e787ec
commit f97be0a636
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lfs/binutils
View File

@@ -101,7 +101,7 @@ endif
cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE)
cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
ifeq "$(ROOT)" "" ifeq "$(ROOT)" ""
cd $(DIR_APP)/binutils-build && cp -v ../$(THISAPP)/include/libiberty.h /usr/include cp -v $(DIR_APP)/include/libiberty.h /usr/include
else else
ifeq "$(PASS)" "1" ifeq "$(PASS)" "1"
cd $(DIR_SRC)/binutils-build && make -C ld clean cd $(DIR_SRC)/binutils-build && make -C ld clean

25
lfs/gcc
View File

@@ -43,9 +43,13 @@ ifeq "$(ROOT)" ""
--libexecdir=/usr/lib --enable-shared \ --libexecdir=/usr/lib --enable-shared \
--enable-threads=posix --enable-__cxa_atexit \ --enable-threads=posix --enable-__cxa_atexit \
--enable-clocale=gnu --enable-languages=c,c++ \ --enable-clocale=gnu --enable-languages=c,c++ \
--disable-nls --disable-nls \
EXTRA_MAKE = --host=i686-pc-linux-gnu \
EXTRA_INSTALL = --target=$(BUILDTARGET)
# This is not taken from the LFS but a fix,
# because the compiler tries to do a cross-compile.
EXTRA_MAKE = LD_LIBRARY_PATH=/usr/lib
EXTRA_INSTALL = LD_LIBRARY_PATH=/usr/lib
else else
ifeq "$(PASS)" "1" ifeq "$(PASS)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-tools1 TARGET = $(DIR_INFO)/$(THISAPP)-tools1
@@ -105,20 +109,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
@mkdir $(DIR_SRC)/gcc-build @mkdir $(DIR_SRC)/gcc-build
ifeq "$(ROOT)" "" ifeq "$(ROOT)" ""
cd $(DIR_APP) && sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
cd $(DIR_APP) && sed 's/^XCFLAGS =$\/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ cd $(DIR_APP) && sed -i 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in
> gcc/Makefile.in
cd $(DIR_APP) && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in cd $(DIR_APP) && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
cd $(DIR_APP) && sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in cd $(DIR_APP) && sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in
cd $(DIR_SRC)/gcc-build && /bin/bash $(DIR_APP)/configure $(EXTRA_CONFIG) cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_SRC)/gcc-build && make install cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
ln -sfv ../usr/bin/cpp /lib ln -sfv ../usr/bin/cpp /lib
ln -sfv gcc /usr/bin/cc ln -sfv gcc /usr/bin/cc
else else
ifeq "$(PASS)" "1" ifeq "$(PASS)" "1"
cd $(DIR_SRC)/gcc-build && /bin/bash $(DIR_APP)/configure $(EXTRA_CONFIG) cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
ln -sfv gcc /tools/bin/cc ln -sfv gcc /tools/bin/cc
@@ -129,7 +132,7 @@ else
cd $(DIR_APP) && sed 's/^XCFLAGS =$\/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ cd $(DIR_APP) && sed 's/^XCFLAGS =$\/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \
> gcc/Makefile.in > gcc/Makefile.in
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-specs-1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-specs-1.patch
cd $(DIR_SRC)/gcc-build && /bin/bash $(DIR_APP)/configure $(EXTRA_CONFIG) cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
endif endif