X-Git-Url: http://gitweb/?a=blobdiff_plain;f=Makefile;h=b1bd46ff65fea33262dd732490dc409ac62b414d;hb=ebc15011db0ba00d3ed23ede0417b71bebb2d6e3;hp=d1f7a6ba97b23e819ddc8802c5191ab887e4b439;hpb=71a47ce94ac592ac8e060b76d4c2636588be8ae7;p=toolchain.git

diff --git a/Makefile b/Makefile
index d1f7a6b..b1bd46f 100644
--- a/Makefile
+++ b/Makefile
@@ -9,16 +9,17 @@ include vars.mk
 all: 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)
 
 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
-$(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.bz2:
-	wget -P $(WORK) -c ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$(KERNEL_HEADERS_VERSION).tar.bz2
+$(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
 
-$(WORK)/linux-$(KERNEL_HEADERS_VERSION): $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.bz2
-	tar -C $(WORK) -xvjf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.bz2
+$(WORK)/linux-$(KERNEL_HEADERS_VERSION): $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz
+	tar -C $(WORK) -xvf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz
 	touch $(WORK)/linux-$(KERNEL_HEADERS_VERSION)
 
 $(CLFS)/usr/include/asm: $(WORK)/linux-$(KERNEL_HEADERS_VERSION)
@@ -35,7 +36,7 @@ linux-headers-clean:
 	rm -vrf $(WORK)/linux-$(KERNEL_HEADERS_VERSION)
 
 linux-headers-distclean: linux-headers-clean
-	rm -vf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.bz2
+	rm -vf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz
 
 
 # LIBGMP
@@ -44,6 +45,7 @@ $(WORK)/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)
 	touch $(WORK)/gmp-$(LIBGMP_VERSION)
 
 $(WORK)/build-libgmp: $(WORK)/gmp-$(LIBGMP_VERSION)
@@ -55,7 +57,7 @@ $(CROSSTOOLS)/lib/libgmp.so: $(WORK)/build-libgmp
 		unset CFLAGS && unset CXXFLAGS && \
 		CPPFLAGS=-fexceptions \
 		$(WORK)/gmp-$(LIBGMP_VERSION)/configure --prefix=$(CROSSTOOLS) --enable-cxx && \
-		make && make install || exit 1
+		make $(MJ) && make install || exit 1
 	touch $(CROSSTOOLS)/lib/libgmp.so
 
 libgmp: $(CROSSTOOLS)/lib/libgmp.so
@@ -84,7 +86,7 @@ $(CROSSTOOLS)/lib/libmpfr.so: $(WORK)/build-libmpfr
 		unset CFLAGS && unset CXXFLAGS && \
 		LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" && \
 		$(WORK)/mpfr-$(LIBMPFR_VERSION)/configure --prefix=$(CROSSTOOLS) --enable-shared --with-gmp=$(CROSSTOOLS) && \
-		make && make install || exit 1
+		make $(MJ) && make install || exit 1
 	touch $(CROSSTOOLS)/lib/libmpfr.so
 
 libmpfr: $(CROSSTOOLS)/lib/libmpfr.so
@@ -114,7 +116,7 @@ $(CROSSTOOLS)/lib/libmpc.so: $(WORK)/build-libmpc
 		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
+		make $(MJ) && make install || exit 1
 	touch $(CROSSTOOLS)/lib/libmpc.so
 
 libmpc: $(CROSSTOOLS)/lib/libmpc.so
@@ -137,7 +139,7 @@ $(WORK)/binutils-$(BINUTILS_VERSION): $(WORK)/binutils-$(BINUTILS_VERSION).tar.b
 
 $(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 && \
@@ -146,7 +148,7 @@ $(CLFS)/usr/include/libiberty.h: $(WORK)/build-binutils
 		$(WORK)/binutils-$(BINUTILS_VERSION)/configure --prefix=$(CROSSTOOLS) \
 		--host=$(HOST) --target=$(TARGET) --with-sysroot=$(CLFS) \
 		--disable-nls --enable-shared --disable-multilib --enable-interwork && \
-		make configure-host && make && make install || exit 1
+		make configure-host && make $(MJ) && make install || exit 1
 	cp -va $(WORK)/binutils-$(BINUTILS_VERSION)/include/libiberty.h $(CLFS)/usr/include
 	touch $(CLFS)/usr/include/libiberty.h
 		
@@ -161,12 +163,10 @@ binutils-distclean: binutils-clean
 
 # GCC-STATIC
 $(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
+	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 $(WORK)/gcc-$(GCC_VERSION)-gnueabihf.patch
+$(WORK)/gcc-$(GCC_VERSION): $(WORK)/gcc-$(GCC_VERSION).tar.bz2
 	tar -C $(WORK) -xvjf $(WORK)/gcc-$(GCC_VERSION).tar.bz2
-	cd $(WORK)/gcc-$(GCC_VERSION) && \
-		patch -p1 -i $(WORK)/gcc-$(GCC_VERSION)-gnueabihf.patch
 	touch $(WORK)/gcc-$(GCC_VERSION)
 
 $(WORK)/build-gcc-static: $(WORK)/gcc-$(GCC_VERSION)
@@ -184,8 +184,8 @@ $(CROSSTOOLS)/lib/gcc: $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION)
 		--disable-libgomp --disable-libmudflap --disable-libssp \
 		--with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \
 		--disable-shared --disable-threads --enable-languages=c --disable-libquadmath \
-		--with-abi=$(ABI) --with-arch=$(ARCH) --with-mode=$(MODE) --with-float=$(FLOAT) --with-fpu=$(FPU) && \
-		make all-gcc all-target-libgcc && make install-gcc install-target-libgcc || exit 1
+		--with-abi=$(ABI) --with-mode=$(MODE) --with-float=$(FLOAT) && \
+		make $(MJ) all-gcc all-target-libgcc && make install-gcc install-target-libgcc || exit 1
 	touch $(CROSSTOOLS)/lib/gcc
 
 gcc-static: linux-headers libgmp libmpfr binutils $(CROSSTOOLS)/lib/gcc
@@ -201,15 +201,8 @@ gcc-static-distclean: gcc-static-clean
 $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2:
 	wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/glibc/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
 	tar -C $(WORK) -xvjf $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2
-	cd $(WORK)/glibc-$(GLIBC_VERSION) && \
-		tar xvjf $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 && \
-		mv glibc-ports-$(GLIBC_VERSION) ports && \
-		sed -e 's/-lgcc_eh//g' -e 's/-lgcc_s//g' -i Makeconfig
 	touch $(WORK)/glibc-$(GLIBC_VERSION)
 
 $(WORK)/build-glibc: $(WORK)/glibc-$(GLIBC_VERSION)
@@ -220,9 +213,6 @@ $(CLFS)/usr/lib/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION)
 	cd $(WORK)/build-glibc && \
 		export PATH=$(CROSSTOOLS)/bin:$$PATH && \
 		echo "libc_cv_forced_unwind=yes" > config.cache && \
-		echo "libc_cv_c_cleanup=yes" >> config.cache && \
-		echo "libc_cv_gnu89_inline=yes" >> config.cache && \
-		echo "libc_cv_ctors_header=yes" >> config.cache && \
 		echo "install_root=$(CLFS)" > configparms && \
 		unset CFLAGS && unset CXXFLAGS && \
 		BUILD_CC="gcc" CC="$(TARGET)-gcc" AR="$(TARGET)-ar" \
@@ -232,7 +222,7 @@ $(CLFS)/usr/lib/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION)
 		--disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.0 \
 		--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
+		make $(MJ) && make install || exit 1
 	touch $(CLFS)/usr/lib/libc.so
 
 glibc: binutils gcc-static $(CLFS)/usr/lib/libc.so
@@ -259,11 +249,14 @@ $(CLFS)/lib/gcc: $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION)
 		--with-headers=$(CLFS)/usr/include --enable-shared  \
 		--disable-multilib --with-sysroot=$(CLFS) --disable-nls \
 		--enable-languages=c,c++ --enable-__cxa_atexit \
-		--enable-threads=posix --disable-libstdcxx-pch --disable-bootstrap --disable-libgomp \
+		--enable-threads=posix --disable-libstdcxx-pch --disable-bootstrap \
+		--disable-libgomp --disable-libssp --disable-libmudflap \
 		--with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \
-		--with-abi=$(ABI) --with-arch=$(ARCH) --with-mode=$(MODE) --with-float=$(FLOAT) --with-fpu=$(FPU) && \
-		make AS_FOR_TARGET="$(TARGET)-as" LD_FOR_TARGET="$(TARGET)-ld" && \
+		--with-abi=$(ABI) --with-mode=$(MODE) --with-float=$(FLOAT) && \
+		make $(MJ) AS_FOR_TARGET="$(TARGET)-as" LD_FOR_TARGET="$(TARGET)-ld" && \
 		make install || exit 1
+	cp -va $(WORK)/build-gcc-final/$(TARGET)/libstdc++-v3/src/.libs/libstdc++.so* $(CLFS)/usr/lib
+	cp -va $(WORK)/build-gcc-final/$(TARGET)/libgcc/libgcc_s.so* $(CLFS)/usr/lib
 	touch $(CLFS)/lib/gcc
 		
 gcc-final: libgmp libmpfr glibc $(CLFS)/lib/gcc
@@ -275,13 +268,14 @@ gcc-final-distclean: gcc-final-clean
 	rm -vf $(WORK)/gcc-$(GCC_VERSION).tar.bz2
 
 
-# SETUP FOR PKGUTILS
+# SETUP FOR PKGUTILS-CROSS
 $(CLFS)/var/lib/pkg/db:
 	install -d -m 0755 $(CLFS)/var/lib/pkg
 	touch $(CLFS)/var/lib/pkg/db
 
 setup: $(CLFS)/var/lib/pkg/db
 
+
 # TEST THE TOOLCHAIN
 $(WORK)/test: $(WORK)/test.c
 	export PATH=$$PATH:$(CROSSTOOLS)/bin && \
@@ -298,4 +292,5 @@ test-clean:
 
 test-distclean: test-clean
 
+
 # End of file