Added libtool to our toolchain to avoid issues with the host one

[toolchain.git] / Makefile

diff --git a/Makefile b/Makefile
index 177b39c57ba75b7e1a0f3dc4d2d4939911293b8f..90dcf8c47345229afb9855650bf1238be0db45d1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,11 @@ include vars.mk
 
 .PHONY: all clean distclean
 
-all: linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final setup test
+all: linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final libtool setup test
 
-clean: linux-headers-clean libgmp-clean libmpfr-clean libmpc-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 libtool-clean test-clean
 
-distclean: clean linux-headers-distclean libgmp-distclean libmpfr-distclean libmpc-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 libtool-distclean test-distclean
 
 
 # LINUX HEADERS
@@ -71,10 +71,8 @@ libgmp-distclean: libgmp-clean
 $(WORK)/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 $(WORK)/libmpfr-3.1.1-p2.patch.gz
+$(WORK)/mpfr-$(LIBMPFR_VERSION): $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2
        tar -C $(WORK) -xvjf $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2
-       cd $(WORK)/mpfr-$(LIBMPFR_VERSION) && \
-               gunzip -c $(WORK)/libmpfr-$(LIBMPFR_VERSION)-p2.patch.gz | patch -p1
        touch $(WORK)/mpfr-$(LIBMPFR_VERSION)
 
 $(WORK)/build-libmpfr: $(WORK)/mpfr-$(LIBMPFR_VERSION)
@@ -133,13 +131,13 @@ $(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
-       tar -C $(WORK) -xvjf $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2
+       tar -C $(WORK) -xvf $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2
        sed -i '/^SUBDIRS/s/doc//' $(WORK)/binutils-$(BINUTILS_VERSION)/*/Makefile.in
        touch $(WORK)/binutils-$(BINUTILS_VERSION)
 
 $(WORK)/build-binutils: $(WORK)/binutils-$(BINUTILS_VERSION)
        mkdir -p $(WORK)/build-binutils
-       touch $(WORK)/build-binutils-build
+       touch $(WORK)/build-binutils
 
 $(CLFS)/usr/include/libiberty.h: $(WORK)/build-binutils
        cd $(WORK)/build-binutils && \
@@ -165,7 +163,7 @@ binutils-distclean: binutils-clean
 $(WORK)/gcc-$(GCC_VERSION).tar.bz2:
        wget -P $(WORK) -c ftp://sources.redhat.com/pub/gcc/releases/gcc-$(GCC_VERSION)/gcc-$(GCC_VERSION).tar.bz2
 
-$(WORK)/gcc-$(GCC_VERSION): $(WORK)/gcc-$(GCC_VERSION).tar.bz2
+$(WORK)/gcc-$(GCC_VERSION): $(WORK)/gcc-$(GCC_VERSION).tar.bz2 $(WORK)/gcc-$(GCC_VERSION)-gnueabihf.patch
        tar -C $(WORK) -xvjf $(WORK)/gcc-$(GCC_VERSION).tar.bz2
        cd $(WORK)/gcc-$(GCC_VERSION) && \
                patch -p1 -i $(WORK)/gcc-$(GCC_VERSION)-gnueabihf.patch
@@ -232,7 +230,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=yes \
+               --with-__thread --with-binutils=$(CROSSTOOLS)/bin --with-fp=yes --enable-obsolete-rpc \
                --with-headers=$(CLFS)/usr/include --cache-file=config.cache && \
                make && make install || exit 1
        touch $(CLFS)/usr/lib/libc.so
@@ -277,6 +275,36 @@ gcc-final-distclean: gcc-final-clean
        rm -vf $(WORK)/gcc-$(GCC_VERSION).tar.bz2
 
 
+# LIBTOOL
+
+$(WORK)/libtool-$(LIBTOOL_VERSION).tar.xz:
+       wget -P $(WORK) -c http://ftp.gnu.org/gnu/libtool/libtool-$(LIBTOOL_VERSION).tar.xz
+
+$(WORK)/libtool-$(LIBTOOL_VERSION): $(WORK)/libtool-$(LIBTOOL_VERSION).tar.xz
+       tar -C $(WORK) -xvJf $(WORK)/libtool-$(LIBTOOL_VERSION).tar.xz
+       touch $(WORK)/libtool-$(LIBTOOL_VERSION)
+
+$(WORK)/build-libtool: $(WORK)/libtool-$(LIBTOOL_VERSION)
+       mkdir -p $(WORK)/build-libtool
+       touch $(WORK)/build-libtool
+
+$(CROSSTOOLS)/lib/libltdl.so: $(WORK)/build-libtool $(WORK)/libtool-$(LIBTOOL_VERSION)
+       cd $(WORK)/build-libtool && \
+               unset CFLAGS && unset CXXFLAGS && \
+               LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" && \
+               $(WORK)/libtool-$(LIBTOOL_VERSION)/configure --prefix=$(CROSSTOOLS) \
+               --program-prefix=$(TARGET)- && \
+               make && make install || exit 1
+       touch $(CROSSTOOLS)/lib/libltdl.so
+
+libtool: gcc-final $(CROSSTOOLS)/lib/libltdl.so
+
+libtool-clean:
+       rm -vrf $(WORK)/build-libtool $(WORK)/libtool-$(LIBTOOL_VERSION)
+
+libtool-distclean:
+       rm -vf $(WORK)/libtool-$(LIBTOOL_VERSION).tar.xz
+
 # SETUP FOR PKGUTILS
 $(CLFS)/var/lib/pkg/db:
        install -d -m 0755 $(CLFS)/var/lib/pkg