X-Git-Url: https://jxself.org/git/?p=linux-libre-firmware.git;a=blobdiff_plain;f=carl9170fw%2Ftoolchain%2FMakefile;h=1752f1f20fcd679617d198e67dced0cf18fabe92;hp=191a28c4605a5d1dd465080698224c3f3d9c282c;hb=97aaa0985b9f4d46ce79b21e20113931b6aed5ae;hpb=6e823d0b6ee854eaf5f0bf28a099a5e6b7c45be2

diff --git a/carl9170fw/toolchain/Makefile b/carl9170fw/toolchain/Makefile
index 191a28c..1752f1f 100644
--- a/carl9170fw/toolchain/Makefile
+++ b/carl9170fw/toolchain/Makefile
@@ -1,24 +1,24 @@
-BINUTILS_VER=2.23.1
-BINUTILS_TAR=binutils-$(BINUTILS_VER).tar.bz2
-BINUTILS_URL="http://mirrors.kernel.org/gnu/binutils/$(BINUTILS_TAR)"
+BINUTILS_VER=2.30
+BINUTILS_TAR=binutils-$(BINUTILS_VER).tar.xz
+BINUTILS_URL="http://ftpmirror.gnu.org/gnu/binutils/$(BINUTILS_TAR)"
 
-NEWLIB_VER=2.0.0
+NEWLIB_VER=3.0.0
 NEWLIB_TAR=newlib-$(NEWLIB_VER).tar.gz
 NEWLIB_URL="ftp://sourceware.org/pub/newlib/$(NEWLIB_TAR)"
 
-GCC_VER=4.8.2
-GCC_TAR=gcc-$(GCC_VER).tar.bz2
-GCC_URL="http://mirrors.kernel.org/gnu/gcc/gcc-$(GCC_VER)/$(GCC_TAR)"
+GCC_VER=8.1.0
+GCC_TAR=gcc-$(GCC_VER).tar.xz
+GCC_URL="http://ftpmirror.gnu.org/gnu/gcc/gcc-$(GCC_VER)/$(GCC_TAR)"
 
-MPFR_VER=3.1.2
-MPFR_TAR=mpfr-$(MPFR_VER).tar.gz
+MPFR_VER=4.0.1
+MPFR_TAR=mpfr-$(MPFR_VER).tar.xz
 MPFR_URL="http://ftpmirror.gnu.org/gnu/mpfr/$(MPFR_TAR)"
 
-GMP_VER=5.1.3
-GMP_TAR=gmp-$(GMP_VER).tar.gz
+GMP_VER=6.1.2
+GMP_TAR=gmp-$(GMP_VER).tar.xz
 GMP_URL="http://ftpmirror.gnu.org/gnu/gmp/$(GMP_TAR)"
 
-MPC_VER=1.0.1
+MPC_VER=1.1.0
 MPC_TAR=mpc-$(MPC_VER).tar.gz
 MPC_URL="http://ftpmirror.gnu.org/gnu/mpc/$(MPC_TAR)"
 
@@ -37,69 +37,68 @@ endef
 all: clean gcc
 
 src/$(MPFR_TAR):
-	wget -P "$(BASEDIR)/src" $(MPFR_URL)
+	wget -P "$(BASEDIR)/src" "$(MPFR_URL)"
 	$(call checksum,$@)
 
 src/$(GMP_TAR):
-	wget -P "$(BASEDIR)/src" $(GMP_URL)
+	wget -P "$(BASEDIR)/src" "$(GMP_URL)"
 	$(call checksum,$@)
 
 src/$(MPC_TAR):
-	wget -P "$(BASEDIR)/src" $(MPC_URL)
+	wget -P "$(BASEDIR)/src" "$(MPC_URL)"
 	$(call checksum,$@)
 
 src/$(BINUTILS_TAR):
-	wget -P "$(BASEDIR)/src" $(BINUTILS_URL)
+	wget -P "$(BASEDIR)/src" "$(BINUTILS_URL)"
 	$(call checksum,$@)
 
 src/$(NEWLIB_TAR):
-	wget -P "$(BASEDIR)/src" $(NEWLIB_URL)
+	wget -P "$(BASEDIR)/src" "$(NEWLIB_URL)"
 	$(call checksum,$@)
 
 src/$(GCC_TAR):
-	wget -P "$(BASEDIR)/src" $(GCC_URL)
+	wget -P "$(BASEDIR)/src" "$(GCC_URL)"
 	$(call checksum,$@)
 
 src/mpfr-$(MPFR_VER): src/$(MPFR_TAR)
-	tar -C "$(BASEDIR)/src" -xf $<
+	tar -C "$(BASEDIR)/src" -xf "$<"
 
 src/gmp-$(GMP_VER): src/$(GMP_TAR)
-	tar -C "$(BASEDIR)/src" -xf $<
+	tar -C "$(BASEDIR)/src" -xf "$<"
 
 src/mpc-$(MPC_VER): src/$(MPC_TAR)
-	tar -C "$(BASEDIR)/src" -xf $<
+	tar -C "$(BASEDIR)/src" -xf "$<"
 
 src/binutils-$(BINUTILS_VER): src/$(BINUTILS_TAR)
-	tar -C "$(BASEDIR)/src" -xf $<
+	tar -C "$(BASEDIR)/src" -xf "$<"
 
 src/newlib-$(NEWLIB_VER): src/$(NEWLIB_TAR)
-	tar -C "$(BASEDIR)/src" -xf $<
+	tar -C "$(BASEDIR)/src" -xf "$<"
 
-src/gcc-$(GCC_VER): src/$(GCC_TAR) src/newlib-$(NEWLIB_VER)
-	tar -C "$(BASEDIR)/src" -xf $<
-	ln -s $(BASEDIR)/src/newlib-$(NEWLIB_VER)/newlib $@
-	ln -s $(BASEDIR)/src/newlib-$(NEWLIB_VER)/libgloss $@
+src/gcc-$(GCC_VER): src/$(GCC_TAR) src/newlib-$(NEWLIB_VER) src/mpc-$(MPC_VER) src/gmp-$(GMP_VER) src/mpfr-$(MPFR_VER)
+	tar -C "$(BASEDIR)/src" -xf "$<"
+	ln -s "$(BASEDIR)/src/newlib-$(NEWLIB_VER)/newlib" "$@"
+	ln -s "$(BASEDIR)/src/newlib-$(NEWLIB_VER)/libgloss" "$@"
+	ln -s "$(BASEDIR)/src/gmp-$(GMP_VER)" "$@/gmp"
+	ln -s "$(BASEDIR)/src/mpfr-$(MPFR_VER)" "$@/mpfr"
+	ln -s "$(BASEDIR)/src/mpc-$(MPC_VER)" "$@/mpc"
 
 binutils: src/binutils-$(BINUTILS_VER)
 	mkdir -p "$(BASEDIR)/build/binutils"
 	cd "$(BASEDIR)/build/binutils"; \
-	$(BASEDIR)/$</configure --target=sh-elf --prefix=$(BASEDIR)/inst; \
+	"$(BASEDIR)"/$</configure --target=sh-elf --prefix="$(BASEDIR)/inst"; \
 	$(MAKE) -j$(JOBS); \
 	$(MAKE) install
 
-gcc: src/gcc-$(GCC_VER) src/mpc-$(MPC_VER) src/gmp-$(GMP_VER) src/mpfr-$(MPFR_VER) binutils
-	cd "$(BASEDIR)/src/gcc-$(GCC_VER)"; \
-	ln -s ../gmp-$(GMP_VER) gmp; \
-	ln -s ../mpfr-$(MPFR_VER) mpfr; \
-	ln -s ../mpc-$(MPC_VER) mpc
+gcc: src/gcc-$(GCC_VER) binutils
 	mkdir -p "$(BASEDIR)/build/gcc"
 	cd "$(BASEDIR)/build/gcc"; \
-	$(BASEDIR)/$</configure --target=sh-elf --prefix=$(BASEDIR)/inst -enable-languages=c --without-pkgversion --with-newlib; \
+	"$(BASEDIR)"/$</configure --target=sh-elf --prefix="$(BASEDIR)/inst" -enable-languages=c --without-pkgversion --with-newlib; \
 	$(MAKE) -j$(JOBS); \
 	$(MAKE) install
 
 clean:
 	rm -rf "$(BASEDIR)/build" "$(BASEDIR)/inst"
-	
+
 distclean: clean
 	rm -rf "$(BASEDIR)/src"