X-Git-Url: http://gitweb/?a=blobdiff_plain;f=Makefile;h=7ea12fa6afb78f10c776da824e792674489039a9;hb=refs%2Fheads%2F3.3;hp=b1bd46ff65fea33262dd732490dc409ac62b414d;hpb=ebc15011db0ba00d3ed23ede0417b71bebb2d6e3;p=toolchain.git

diff --git a/Makefile b/Makefile
index b1bd46f..7ea12fa 100644
--- a/Makefile
+++ b/Makefile
@@ -6,20 +6,32 @@ include vars.mk
 
 .PHONY: all clean distclean
 
-all: linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final setup test
+all: filesystem linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final setup test
 
 clean: linux-headers-clean libgmp-clean libmpfr-clean libmpc-clean binutils-clean gcc-static-clean glibc-clean gcc-final-clean test-clean
-	rm -rvf $(CROSSTOOLS) $(CLFS)
+	rm -rf $(CROSSTOOLS) $(CLFS)
 
-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 filesystem-clean linux-headers-distclean libgmp-distclean libmpfr-distclean libmpc-distclean binutils-distclean gcc-static-distclean glibc-distclean gcc-final-distclean test-distclean
 
+# Prepare the filessytem
+$(CLFS)/lib:
+	install -d $(CLFS)/lib
+	ln -s lib $(CLFS)/lib64
+	install -d $(CLFS)/usr/lib
+	ln -s lib $(CLFS)/usr/lib64
+	touch $(CLFS)/lib
+
+filesystem: $(CLFS)/lib
+
+filesystem-clean:
+	rm -rf $(CLFS)/lib* $(CLFS)/usr/lib*
 
 # LINUX HEADERS
 $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz:
-	wget -P $(WORK) -c ftp://ftp.kernel.org/pub/linux/kernel/v4.x/linux-$(KERNEL_HEADERS_VERSION).tar.xz
+	wget -P $(WORK) -c https://www.kernel.org/pub/linux/kernel/v4.x/linux-$(KERNEL_HEADERS_VERSION).tar.xz
 
 $(WORK)/linux-$(KERNEL_HEADERS_VERSION): $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz
-	tar -C $(WORK) -xvf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz
+	tar -C $(WORK) -xf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz
 	touch $(WORK)/linux-$(KERNEL_HEADERS_VERSION)
 
 $(CLFS)/usr/include/asm: $(WORK)/linux-$(KERNEL_HEADERS_VERSION)
@@ -33,10 +45,10 @@ $(CLFS)/usr/include/asm: $(WORK)/linux-$(KERNEL_HEADERS_VERSION)
 linux-headers: $(CLFS)/usr/include/asm
 
 linux-headers-clean:
-	rm -vrf $(WORK)/linux-$(KERNEL_HEADERS_VERSION)
+	rm -rf $(WORK)/linux-$(KERNEL_HEADERS_VERSION)
 
 linux-headers-distclean: linux-headers-clean
-	rm -vf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz
+	rm -f $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz
 
 
 # LIBGMP
@@ -44,8 +56,7 @@ $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2:
 	wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/gmp/gmp-$(LIBGMP_VERSION).tar.bz2
 
 $(WORK)/gmp-$(LIBGMP_VERSION): $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2
-	tar -C $(WORK) -xvjf $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2
-	mv `find $(WORK) -type d -name 'gmp-*'` $(WORK)/gmp-$(LIBGMP_VERSION)
+	tar -C $(WORK) -xjf $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2
 	touch $(WORK)/gmp-$(LIBGMP_VERSION)
 
 $(WORK)/build-libgmp: $(WORK)/gmp-$(LIBGMP_VERSION)
@@ -63,10 +74,10 @@ $(CROSSTOOLS)/lib/libgmp.so: $(WORK)/build-libgmp
 libgmp: $(CROSSTOOLS)/lib/libgmp.so
 
 libgmp-clean:
-	rm -vrf $(WORK)/build-libgmp $(WORK)/gmp-$(LIBGMP_VERSION)
+	rm -rf $(WORK)/build-libgmp $(WORK)/gmp-$(LIBGMP_VERSION)
 
 libgmp-distclean: libgmp-clean
-	rm -vrf $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2
+	rm -rf $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2
 
 
 # LIBMPFR
@@ -74,7 +85,7 @@ $(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
-	tar -C $(WORK) -xvjf $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2
+	tar -C $(WORK) -xjf $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2
 	touch $(WORK)/mpfr-$(LIBMPFR_VERSION)
 
 $(WORK)/build-libmpfr: $(WORK)/mpfr-$(LIBMPFR_VERSION)
@@ -92,10 +103,10 @@ $(CROSSTOOLS)/lib/libmpfr.so: $(WORK)/build-libmpfr
 libmpfr: $(CROSSTOOLS)/lib/libmpfr.so
 
 libmpfr-clean:
-	rm -vrf $(WORK)/build-libmpfr $(WORK)/mpfr-$(LIBMPFR_VERSION)
+	rm -rf $(WORK)/build-libmpfr $(WORK)/mpfr-$(LIBMPFR_VERSION)
 
 libmpfr-distclean: libmpfr-clean
-	rm -vrf $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2
+	rm -rf $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2
 
 
 # LIBMPC
@@ -103,7 +114,7 @@ $(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
+	tar -C $(WORK) -xzf $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz
 	touch $(WORK)/mpc-$(LIBMPC_VERSION)
 
 $(WORK)/build-libmpc: $(WORK)/mpc-$(LIBMPC_VERSION)
@@ -122,10 +133,10 @@ $(CROSSTOOLS)/lib/libmpc.so: $(WORK)/build-libmpc
 libmpc: $(CROSSTOOLS)/lib/libmpc.so
 
 libmpc-clean:
-	rm -vrf $(WORK)/build-libmpc $(WORK)/mpc-$(LIBMPC_VERSION)
+	rm -rf $(WORK)/build-libmpc $(WORK)/mpc-$(LIBMPC_VERSION)
 
 libmpc-distclean: libmpc-clean
-	rm -vrf $(WORK)/mpc-$(LIBMPC_VERSION).tar.bz2
+	rm -rf $(WORK)/mpc-$(LIBMPC_VERSION).tar.bz2
 
 
 # BINUTILS
@@ -133,7 +144,7 @@ $(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) -xvf $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2
+	tar -C $(WORK) -xf $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2
 	sed -i '/^SUBDIRS/s/doc//' $(WORK)/binutils-$(BINUTILS_VERSION)/*/Makefile.in
 	touch $(WORK)/binutils-$(BINUTILS_VERSION)
 
@@ -155,7 +166,7 @@ $(CLFS)/usr/include/libiberty.h: $(WORK)/build-binutils
 binutils: linux-headers $(CLFS)/usr/include/libiberty.h
 
 binutils-clean:
-	rm -vrf $(WORK)/build-binutils $(WORK)/binutils-$(BINUTILS_VERSION)
+	rm -rf $(WORK)/build-binutils $(WORK)/binutils-$(BINUTILS_VERSION)
 
 binutils-distclean: binutils-clean
 	rm -f $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2
@@ -166,7 +177,7 @@ $(WORK)/gcc-$(GCC_VERSION).tar.bz2:
 	wget -P $(WORK) -c ftp://gcc.gnu.org/pub/gcc/releases/gcc-$(GCC_VERSION)/gcc-$(GCC_VERSION).tar.bz2
 
 $(WORK)/gcc-$(GCC_VERSION): $(WORK)/gcc-$(GCC_VERSION).tar.bz2
-	tar -C $(WORK) -xvjf $(WORK)/gcc-$(GCC_VERSION).tar.bz2
+	tar -C $(WORK) -xjf $(WORK)/gcc-$(GCC_VERSION).tar.bz2
 	touch $(WORK)/gcc-$(GCC_VERSION)
 
 $(WORK)/build-gcc-static: $(WORK)/gcc-$(GCC_VERSION)
@@ -191,10 +202,10 @@ $(CROSSTOOLS)/lib/gcc: $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION)
 gcc-static: linux-headers libgmp libmpfr binutils $(CROSSTOOLS)/lib/gcc
 
 gcc-static-clean:
-	rm -vrf $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION)
+	rm -rf $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION)
 
 gcc-static-distclean: gcc-static-clean
-	rm -vf $(WORK)/gcc-$(GCC_VERSION).tar.bz2
+	rm -f $(WORK)/gcc-$(GCC_VERSION).tar.bz2
 
 
 # GLIBC
@@ -228,10 +239,10 @@ $(CLFS)/usr/lib/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION)
 glibc: binutils gcc-static $(CLFS)/usr/lib/libc.so
 
 glibc-clean:
-	rm -vrf $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION)
+	rm -rf $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION)
 
 glibc-distclean: glibc-clean
-	rm -vf $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2
+	rm -f $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2
 
 
 # GCC-FINAL
@@ -262,10 +273,10 @@ $(CLFS)/lib/gcc: $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION)
 gcc-final: libgmp libmpfr glibc $(CLFS)/lib/gcc
 
 gcc-final-clean:
-	rm -vrf $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION)
+	rm -rf $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION)
 
 gcc-final-distclean: gcc-final-clean
-	rm -vf $(WORK)/gcc-$(GCC_VERSION).tar.bz2
+	rm -f $(WORK)/gcc-$(GCC_VERSION).tar.bz2
 
 
 # SETUP FOR PKGUTILS-CROSS
@@ -288,7 +299,7 @@ $(WORK)/test: $(WORK)/test.c
 test: gcc-final $(WORK)/test
 
 test-clean:
-	rm -vrf $(WORK)/test
+	rm -rf $(WORK)/test
 
 test-distclean: test-clean