From c6fb82cf1a0a2442678ce0954f37359d9e595e36 Mon Sep 17 00:00:00 2001
From: "Koenig, Joerg" <Joerg.Koenig@techsat.com>
Date: Sun, 19 Apr 2020 08:41:52 +0200
Subject: New release 1.6.0

Change-Id: Iac432ee766fd3437540d803d02eede3c287fa858
---
 Makefile                   |  16 +++++++++++-----
 SOURCES/mpfr-4.0.1.tar.bz2 | Bin 1626420 -> 0 bytes
 versions.mk.inc            |  16 ++++++++--------
 3 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 SOURCES/mpfr-4.0.1.tar.bz2

diff --git a/Makefile b/Makefile
index 7226dc0..002f053 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ $(SOURCE_DIR)/gmp-$(VERSION_GMP).tar.lz:
 	wget -c https://gmplib.org/download/gmp/gmp-$(VERSION_GMP).tar.lz -O \
 		$(SOURCE_DIR)/gmp-$(VERSION_GMP).tar.lz
 $(SOURCE_DIR)/mingw-w64-v$(VERSION_MINGW).tar.bz2:
-	wget -c https://datapacket.dl.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$(VERSION_MINGW).tar.bz2 -O \
+	wget -c https://vorboss.dl.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$(VERSION_MINGW).tar.bz2 -O \
 		$(SOURCE_DIR)/mingw-w64-v$(VERSION_MINGW).tar.bz2
 $(SOURCE_DIR)/mpc-$(VERSION_MPC).tar.gz:
 	wget -c ftp://ftp.gnu.org/gnu/mpc/mpc-$(VERSION_MPC).tar.gz -O \
@@ -120,13 +120,16 @@ $(SOURCE_DIR)/zlib-$(VERSION_ZLIB).tar.gz:
 	wget -c https://www.zlib.net/zlib-$(VERSION_ZLIB).tar.gz -O \
 		$(SOURCE_DIR)/zlib-$(VERSION_ZLIB).tar.gz
 $(SOURCE_DIR)/bzip2-$(VERSION_BZ2).tar.gz:
-	wget -c https://netcologne.dl.sourceforge.net/project/bzip2/bzip2-$(VERSION_BZ2).tar.gz -O \
+	wget -c ftp://sourceware.org/pub/bzip2/bzip2-$(VERSION_BZ2).tar.gz -O \
 		$(SOURCE_DIR)/bzip2-$(VERSION_BZ2).tar.gz
 $(SOURCE_DIR)/gdb-$(VERSION_GDB).tar.gz:
 	wget -c ftp://sourceware.org/pub/gdb/releases/gdb-$(VERSION_GDB).tar.gz -O \
 		$(SOURCE_DIR)/gdb-$(VERSION_GDB).tar.gz
+#$(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2:
+#	wget -c "ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-$(VERSION_ISL).tar.bz2" -O \
+#		$(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2
 $(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2:
-	wget -c "ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-$(VERSION_ISL).tar.bz2" -O \
+	wget -c "http://isl.gforge.inria.fr/isl-$(VERSION_ISL).tar.bz2" -O \
 		$(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2
 
 download: $(SOURCE_PACKAGES)
@@ -167,8 +170,8 @@ prepare:
 	cd $(UNPACK_DIR)/binutils-$(VERSION_BINUTILS) && \
 		patch -p1 <  $(PATCHES_DIR)/0004-Windows-Use-not-in-progpath-and-leave-case-as-is.patch
 	tar -jxf $(SOURCE_DIR)/mingw-w64-v$(VERSION_MINGW).tar.bz2 -C $(UNPACK_DIR)/
-	cd $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-tools/widl && \
-	    patch -p0 < $(PATCHES_DIR)/mingw-tools-widl-realloc.patch
+	#cd $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-tools/widl && \
+	#    patch -p0 < $(PATCHES_DIR)/mingw-tools-widl-realloc.patch
 	tar -jxf $(SOURCE_DIR)/mpfr-$(VERSION_MPFR).tar.bz2 -C $(UNPACK_DIR)/
 	tar -jxf $(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2 -C $(UNPACK_DIR)/
 	tar -zxf $(SOURCE_DIR)/mpc-$(VERSION_MPC).tar.gz -C $(UNPACK_DIR)/
@@ -311,6 +314,7 @@ xgcc-all:
 xgcc-build-binutils:
 	mkdir -p $(BUILD_DIR)/binutils
 	cd $(BUILD_DIR)/binutils ;\
+	    	PATH=$(INST_BASE)/gcc/bin:$(PATH) \
 		LDLAGS="-static-libgcc -static-libstdc++" \
 		CFLAGS="-O2 -pipe" \
 		CXXFLAGS="-O2 -pipe" \
@@ -333,6 +337,7 @@ xgcc-build-binutils:
 xgcc-mingw-pass1: 
 	mkdir -p $(BUILD_DIR)/mingw
 	cd $(BUILD_DIR)/mingw ;\
+	PATH=$(INST_BASE)/gcc/bin:$(PATH) \
 	LDLAGS="-static-libgcc -static-libstdc++" \
 	CFLAGS="-O2 -pipe" \
 	CXXFLAGS="-O2 -pipe" \
@@ -388,6 +393,7 @@ xgcc-pthread-32:
 xgcc-gcc-pass1: 
 	mkdir -p $(BUILD_DIR)/gcc
 	cd $(BUILD_DIR)/gcc && \
+	PATH=$(INST_BASE)/gcc/bin:$(PATH) \
 	LDLAGS="-static-libgcc -static-libstdc++" \
 	CFLAGS="-O2 -pipe" \
 	CXXFLAGS="-O2 -pipe" \
diff --git a/SOURCES/mpfr-4.0.1.tar.bz2 b/SOURCES/mpfr-4.0.1.tar.bz2
deleted file mode 100644
index 47239f4..0000000
Binary files a/SOURCES/mpfr-4.0.1.tar.bz2 and /dev/null differ
diff --git a/versions.mk.inc b/versions.mk.inc
index bf2b2c0..f70ac34 100644
--- a/versions.mk.inc
+++ b/versions.mk.inc
@@ -1,13 +1,13 @@
-SUITE			= 1.5.0
+SUITE			= 1.6.0
 
-VERSION_BINUTILS	= 2.33.1
-VERSION_GCC		= 9.2.0
-VERSION_MINGW		= 6.0.0
-VERSION_GMP		= 6.1.2
+VERSION_BINUTILS	= 2.34
+VERSION_GCC		= 9.3.0
+VERSION_MINGW		= 7.0.0
+VERSION_GMP		= 6.2.0
 VERSION_MPC		= 1.1.0
 VERSION_ISL		= 0.18
-VERSION_MPFR		= 4.0.1
-VERSION_GDB		= 8.2
-VERSION_BZ2		= 1.0.6
+VERSION_MPFR		= 4.0.2
+VERSION_GDB		= 9.1
+VERSION_BZ2		= 1.0.8
 VERSION_ZLIB		= 1.2.11
 
-- 
cgit v0.12