Forgotten patch tag in Makefile

[attic/toolchain-noeabi.git] / Makefile

diff --git a/Makefile b/Makefile
index 5ca990ce7e5fec3d02d20fa1504c9e4d002f7140..22ec815a294876999b09888ec8e374523fc11ab5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ libgmp-distclean: libgmp-clean
 
 # LIBMPFR
 $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2:
-       wget -P $(WORK) -c http://www.mpfr.org/mpfr-current/mpfr-$(LIBMPFR_VERSION).tar.bz2
+       wget -P $(WORK) -c http://ftp.gnu.org/gnu/mpfr/mpfr-$(LIBMPFR_VERSION).tar.bz2
 
 $(WORK)/mpfr-$(LIBMPFR_VERSION): $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2
        tar -C $(WORK) -xvjf $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2
@@ -104,6 +104,7 @@ $(WORK)/binutils-$(BINUTILS_VERSION): $(WORK)/binutils-$(BINUTILS_VERSION).tar.b
        tar -C $(WORK) -xvjf $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2
        cd $(WORK)/binutils-$(BINUTILS_VERSION) && \
                patch -p1 -i $(WORK)/binutils-$(BINUTILS_VERSION)-branch_update-5.patch
+       sed -i '/^SUBDIRS/s/doc//' $(WORK)/binutils-$(BINUTILS_VERSION)/*/Makefile.in
        touch $(WORK)/binutils-$(BINUTILS_VERSION)
 
 $(WORK)/build-binutils: $(WORK)/binutils-$(BINUTILS_VERSION)
@@ -116,7 +117,7 @@ $(CLFS)/usr/include/libiberty.h: $(WORK)/build-binutils
                AR=ar AS=as \
                $(WORK)/binutils-$(BINUTILS_VERSION)/configure --prefix=$(CROSSTOOLS) \
                --host=$(HOST) --target=$(TARGET) --with-sysroot=$(CLFS) \
-               --disable-nls --enable-shared --disable-multilib --nfp && \
+               --disable-nls --enable-shared --disable-multilib && \
                make configure-host && make && make install || exit 1
        cp -va $(WORK)/binutils-$(BINUTILS_VERSION)/include/libiberty.h $(CLFS)/usr/include
        touch $(CLFS)/usr/include/libiberty.h
@@ -148,9 +149,8 @@ $(CROSSTOOLS)/lib/gcc: $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION)
                AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \
                $(WORK)/gcc-$(GCC_VERSION)/configure --prefix=$(CROSSTOOLS) \
                --build=$(HOST) --host=$(HOST) --target=$(TARGET) \
-               --disable-multilib --disable-nls \
-               --without-headers --enable-__cxa_atexit --enable-symvers=gnu --disable-decimal-float \
-               --nfp --without-fp --with-softfloat-support=internal \
+               --disable-multilib --with-sysroot=$(CLFS) --disable-nls \
+               --without-headers --with-newlib --disable-decimal-float \
                --disable-libgomp --disable-libmudflap --disable-libssp \
                --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) \
                --disable-shared --disable-threads --enable-languages=c && \
@@ -172,10 +172,11 @@ $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2:
 
 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2:
        wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/glibc/glibc-ports-$(GLIBC_VERSION).tar.bz2
-$(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2
 
+$(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-$(GLIBC_VERSION)-make382.patch
        tar -C $(WORK) -xvjf $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2
        cd $(WORK)/glibc-$(GLIBC_VERSION) && \
+               patch -p1 -i $(WORK)/glibc-$(GLIBC_VERSION)-make382.patch && \
                tar xvjf $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 && \
                mv glibc-ports-$(GLIBC_VERSION) ports && \
                sed -e 's/-lgcc_eh//g' -i Makeconfig
@@ -198,7 +199,7 @@ $(CLFS)/usr/lib/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION)
                $(WORK)/glibc-$(GLIBC_VERSION)/configure --prefix=/usr \
                --libexecdir=/usr/lib/glibc --host=$(TARGET) --build=$(HOST) \
                --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.0 \
-               --with-__thread --with-binutils=$(CROSSTOOLS)/bin --with-fp=no \
+               --with-__thread --with-binutils=$(CROSSTOOLS)/bin \
                --with-headers=$(CLFS)/usr/include --cache-file=config.cache && \
                make && make install || exit 1
        touch $(CLFS)/usr/lib/libc.so
@@ -224,7 +225,7 @@ $(CLFS)/lib/gcc: $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION)
                AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \
                $(WORK)/gcc-$(GCC_VERSION)/configure --prefix=$(CROSSTOOLS) \
                --build=$(HOST) --host=$(HOST) --target=$(TARGET) \
-               -with-fp=no --with-headers=$(CLFS)/usr/include \
+               --with-headers=$(CLFS)/usr/include \
                --disable-multilib --with-sysroot=$(CLFS) --disable-nls \
                --enable-languages=c,c++ --enable-__cxa_atexit \
                --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) \
@@ -247,7 +248,7 @@ $(WORK)/test: $(WORK)/test.c
        export PATH=$$PATH:$(CROSSTOOLS)/bin && \
        unset CFLAGS && unset CXXFLAGS && unset CC && \
        AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \
-       $(TARGET)-gcc -Wall -o test $(WORK)/test.c
+       $(TARGET)-gcc -Wall -o $(WORK)/test $(WORK)/test.c
        [ "`file -b $(WORK)/test | cut -d',' -f2 | sed 's| ||g'`" = "ARM"  ] || exit 1
        touch $(WORK)/test