Added new section in the Makefile to handle pkgutils-cross in CLFS

[toolchain-softfp.git] / Makefile

diff --git a/Makefile b/Makefile
index f50bd06684753d6d26c3725aa65c6c5a572709ef..1a17dd5317cd5d8a9e2534ee4be27dd4fb403e31 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,11 @@ include vars.mk
 
 .PHONY: all clean distclean
 
-all: linux-headers libgmp libmpfr binutils gcc-static glibc gcc-final test
+all: linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final setup test
 
-clean: linux-headers-clean libgmp-clean libmpfr-clean binutils-clean gcc-static-clean glibc-clean gcc-final-clean test-clean
+clean: linux-headers-clean libgmp-clean libmpfr-clean libmpc-clean binutils-clean gcc-static-clean glibc-clean gcc-final-clean test-clean
 
-distclean: clean linux-headers-distclean libgmp-distclean libmpfr-distclean binutils-distclean gcc-static-distclean glibc-distclean gcc-final-distclean test-distclean
+distclean: clean linux-headers-distclean libgmp-distclean libmpfr-distclean libmpc-distclean binutils-distclean gcc-static-distclean glibc-distclean gcc-final-distclean test-distclean
 
 
 # LINUX HEADERS
@@ -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
@@ -96,14 +96,43 @@ libmpfr-distclean: libmpfr-clean
        rm -vrf $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2
 
 
+# LIBMPC
+$(WORK)/mpc-$(LIBMPC_VERSION).tar.gz:
+       wget -P $(WORK) -c http://www.multiprecision.org/mpc/download/mpc-$(LIBMPC_VERSION).tar.gz
+
+$(WORK)/mpc-$(LIBMPC_VERSION): $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz
+       tar -C $(WORK) -xvzf $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz
+       touch $(WORK)/mpc-$(LIBMPC_VERSION)
+
+$(WORK)/build-libmpc: $(WORK)/mpc-$(LIBMPC_VERSION)
+       mkdir -p $(WORK)/build-libmpc
+       touch $(WORK)/build-libmpc
+
+$(CROSSTOOLS)/lib/libmpc.so: $(WORK)/build-libmpc
+       cd $(WORK)/build-libmpc && \
+               unset CFLAGS && unset CXXFLAGS && \
+               LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" && \
+               $(WORK)/mpc-$(LIBMPC_VERSION)/configure --prefix=$(CROSSTOOLS) \
+               --enable-shared --with-gmp=$(CROSSTOOLS) --with-mpfr=$(CROSSTOOLS) && \
+               make && make install || exit 1
+       touch $(CROSSTOOLS)/lib/libmpc.so
+
+libmpc: $(CROSSTOOLS)/lib/libmpc.so
+
+libmpc-clean:
+       rm -vrf $(WORK)/build-libmpc $(WORK)/mpc-$(LIBMPC_VERSION)
+
+libmpc-distclean: libmpc-clean
+       rm -vrf $(WORK)/mpc-$(LIBMPC_VERSION).tar.bz2
+
+
 # BINUTILS
 $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2:
        wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/binutils/binutils-$(BINUTILS_VERSION).tar.bz2
 
-$(WORK)/binutils-$(BINUTILS_VERSION): $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2 $(WORK)/binutils-$(BINUTILS_VERSION)-branch_update-5.patch
+$(WORK)/binutils-$(BINUTILS_VERSION): $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2
        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)
@@ -152,7 +181,7 @@ $(CROSSTOOLS)/lib/gcc: $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION)
                --without-headers --enable-__cxa_atexit --enable-symvers=gnu --disable-decimal-float \
                --nfp --without-fp --with-softfloat-support=internal \
                --disable-libgomp --disable-libmudflap --disable-libssp \
-               --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) \
+               --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \
                --disable-shared --disable-threads --enable-languages=c && \
                make && make install || exit 1
        touch $(CROSSTOOLS)/lib/gcc
@@ -172,11 +201,12 @@ $(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)-pot.patch
        tar -C $(WORK) -xvjf $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2
        cd $(WORK)/glibc-$(GLIBC_VERSION) && \
                tar xvjf $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 && \
+               patch -p1 -i $(WORK)/glibc-$(GLIBC_VERSION)-pot.patch && \
                mv glibc-ports-$(GLIBC_VERSION) ports && \
                sed -e 's/-lgcc_eh//g' -i Makeconfig
        touch $(WORK)/glibc-$(GLIBC_VERSION)
@@ -224,10 +254,10 @@ $(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-fp=no --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) \
+               --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \
                --enable-c99 --enable-long-long --enable-threads=posix && \
                make AS_FOR_TARGET="$(TARGET)-as" LD_FOR_TARGET="$(TARGET)-ld" && \
                make install || exit 1
@@ -242,29 +272,26 @@ gcc-final-distclean: gcc-final-clean
        rm -vf $(WORK)/gcc-$(GCC_VERSION).tar.bz2
 
 
-# TEST THE TOOLCHAIN
-$(WORK)/build-test:
-       mkdir -p $(WORK)/build-test
-       touch $(WORK)/build-test
+# SETUP FOR PKGUTILS
+$(CLFS)/var/lib/pkg/db:
+       install -d -m 0755 $(CLFS)/var/lib/pkg
+       touch $(CLFS)/var/lib/pkg/db
 
-$(WORK)/build-test/hello.c: $(WORK)/build-test
-       echo '#include <stdio.h>' > $(WORK)/build-test/hello.c
-       echo 'int main(int argc,char ** argv){printf("Hello World!\n");return 0;}' >> $(WORK)/build-test/hello.c
-       touch $(WORK)/build-test/hello.c
+setup: $(CLFS)/var/lib/pkg/db
 
-$(WORK)/build-test/hello: $(WORK)/build-test/hello.c
-       cd $(WORK)/build-test && \
-               export PATH=$$PATH:$(CROSSTOOLS)/bin && \
-               unset CFLAGS && unset CXXFLAGS && unset CC && \
-               AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \
-               $(TARGET)-gcc -Wall -o hello hello.c
-       [ "$$(file -b $(WORK)/build-test/hello | cut -d',' -f2 | sed 's| ||g' )" == "ARM"  ] || exit 1
-       touch $(WORK)/build-test/hello
+# TEST THE TOOLCHAIN
+$(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 $(WORK)/test $(WORK)/test.c
+       [ "`file -b $(WORK)/test | cut -d',' -f2 | sed 's| ||g'`" = "ARM"  ] || exit 1
+       touch $(WORK)/test
 
-test: gcc-final $(WORK)/build-test/hello
+test: gcc-final $(WORK)/test
 
 test-clean:
-       rm -vrf $(WORK)/build-test
+       rm -vrf $(WORK)/test
 
 test-distclean: test-clean