From 7c63b91cd36bf1dc07fde524c2125082853b4cea Mon Sep 17 00:00:00 2001 From: "Koenig, Joerg" Date: Mon, 21 Jun 2021 13:47:19 +0200 Subject: Updated to MinGW 9.0.0 Change-Id: I23dabacf112c6fddf7928c79aa1b0536e8ad1669 --- Makefile | 74 ++++++++++++++++++++++++++++----------------------------- versions.mk.inc | 2 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index 41a7fff..abd3dc8 100644 --- a/Makefile +++ b/Makefile @@ -11,18 +11,18 @@ # Multilib: -m32, -m64 # # host -# +# # The system that is going to run the software once it is built. Once the software # has been built, it will execute on this particular system. -# +# # build -# +# # The system where the build process is being executed. For most uses this # would be the same as the host system, but in case of cross-compilation # the two obviously differ. -# +# # target -# +# # The system against which the software being built will run on. This only exists, or rather # has a meaning, when the software being built may interact specifically with a # system that differs from the one it's being executed on (our host). This is the case @@ -99,14 +99,14 @@ SOURCE_PACKAGES = \ $(SOURCE_DIR)/mpc-$(VERSION_MPC).tar.gz \ $(SOURCE_DIR)/mpfr-$(VERSION_MPFR).tar.bz2 \ $(SOURCE_DIR)/zlib-$(VERSION_ZLIB).tar.gz \ - $(SOURCE_DIR)/bzip2-$(VERSION_BZ2).tar.gz + $(SOURCE_DIR)/bzip2-$(VERSION_BZ2).tar.gz #JOBS = -j4 JOBS = $(SOURCE_DIR)/binutils-$(VERSION_BINUTILS).tar.bz2: _download_prepare wget -c https://ftp.gnu.org/gnu/binutils/binutils-$(VERSION_BINUTILS).tar.bz2 -O \ - $(SOURCE_DIR)/binutils-$(VERSION_BINUTILS).tar.bz2 2>&1 + $(SOURCE_DIR)/binutils-$(VERSION_BINUTILS).tar.bz2 2>&1 $(SOURCE_DIR)/gcc-$(VERSION_GCC).tar.gz: wget -c https://ftp.gnu.org/gnu/gcc/gcc-$(VERSION_GCC)/gcc-$(VERSION_GCC).tar.gz -O \ $(SOURCE_DIR)/gcc-$(VERSION_GCC).tar.gz @@ -114,7 +114,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://vorboss.dl.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$(VERSION_MINGW).tar.bz2 -O \ + wget -c https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v$(VERSION_MINGW).tar.bz2/download -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 \ @@ -148,7 +148,7 @@ ifneq ($(LOCAL_INST_PATH),) mkdir -p $(LOCAL_INST_PATH) mkdir -p $(LOCAL_INST_PATH)/../x86-mingw64 cd $(LOCAL_INST_PATH); \ - tar -zxf $(PWD)/gcc-suite-$(VERSION_SUITE)-gcc-$(VERSION_GCC)-x86-linux64.tgz + tar -zxf $(PWD)/gcc-suite-$(VERSION_SUITE)-gcc-$(VERSION_GCC)-x86-linux64.tgz cd $(LOCAL_INST_PATH); \ tar -zxf $(PWD)/gcc-suite-$(VERSION_SUITE)-xgcc-$(VERSION_GCC)-$(VERSION_MINGW)-x86-linux64.tgz cd $(LOCAL_INST_PATH)/../x86-mingw64; \ @@ -272,8 +272,8 @@ lingcc-finish: rm -Rf $(INST_BASE)/gcc/share find $(INST_BASE)/gcc -type f -name "*.py" | xargs rm -f -lingcc-gdb: - rm -Rf $(BUILD_DIR)/lingdb +lingcc-gdb: + rm -Rf $(BUILD_DIR)/lingdb mkdir -p $(BUILD_DIR)/lingdb cd $(BUILD_DIR)/lingdb && \ export PATH=$(INST_BASE)/gcc/bin:$(PATH) && \ @@ -297,7 +297,7 @@ else cd $(INST_BASE) && \ tar -zcf $(PWD)/gcc-suite-$(VERSION_SUITE)-gcc-$(VERSION_GCC)-x86-linux64.tgz ./gcc endif - + ############################################################################## # Linux based MinGW multilib cross compiler @@ -346,7 +346,7 @@ xgcc-build-binutils: make $(JOBS) install-strip cd $(XGCC_INST_DIR)/bin && ln -s x86_64-w64-mingw32-windres windres -xgcc-mingw-pass1: +xgcc-mingw-pass1: mkdir -p $(BUILD_DIR)/mingw cd $(BUILD_DIR)/mingw ;\ PATH=$(INST_BASE)/gcc/bin:$(PATH) \ @@ -375,7 +375,7 @@ xgcc-pthread-64: --host=$(XGCC_TARGET64) && \ make $(JOBS) clean && \ make $(JOBS) && \ - make $(JOBS) install + make $(JOBS) install mv -f $(XGCC_INST_DIR)/$(XGCC_TARGET64)/bin/libwinpthread-1.dll \ $(XGCC_INST_DIR)/$(XGCC_TARGET64)/lib @@ -402,7 +402,7 @@ xgcc-pthread-32: $(XGCC_INST_DIR)/$(XGCC_TARGET64)/lib32 -xgcc-gcc-pass1: +xgcc-gcc-pass1: mkdir -p $(BUILD_DIR)/gcc cd $(BUILD_DIR)/gcc && \ PATH=$(INST_BASE)/gcc/bin:$(PATH) \ @@ -439,7 +439,7 @@ xgcc-gcc-pass1: make $(JOBS) all-gcc && \ make $(JOBS) install-gcc -xgcc-mingw-pass2: +xgcc-mingw-pass2: cd $(BUILD_DIR)/mingw && \ LDLAGS="-static-libgcc -static-libstdc++" \ CFLAGS="-O2 -pipe" \ @@ -457,7 +457,7 @@ xgcc-mingw-pass2: make $(JOBS) && \ make $(JOBS) install -xgcc-gcc-pass2: +xgcc-gcc-pass2: export PATH=$(XGCC_INST_DIR)/bin:$(PATH) && \ cd $(BUILD_DIR)/gcc && \ make $(JOBS) && \ @@ -465,7 +465,7 @@ xgcc-gcc-pass2: xgcc-finish: - cd $(XGCC_INST_DIR) && rm -f mingw + cd $(XGCC_INST_DIR) && rm -f mingw for f in `find $(XGCC_INST_DIR) -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary' | cut -d: -f1`; do \ $(XGCC_INST_DIR)/bin/$(XGCC_TARGET64)-strip $$f ;\ done; @@ -492,7 +492,7 @@ xgcc-finish: cd $(XGCC_INST_DIR)/x86_64-w64-mingw32/include && \ ln -s windows.h Windows.h -xgcc-gdb: +xgcc-gdb: rm -rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb cd $(BUILD_DIR)/gdb && \ export PATH=$(XGCC_BINPATH):$(INST_BASE)/gcc/bin:$(PATH) && \ @@ -506,7 +506,7 @@ xgcc-gdb: --build=$(ARCH64) \ --host=$(ARCH64) && \ make $(JOBS) && make $(JOBS) install - + xgcc-reimp: rm -Rf $(BUILD_DIR)/reimp cd $(BUILD_DIR)/ && \ @@ -562,12 +562,12 @@ xgcc-zlib: RANLIB=$(XGCC_BINPATH)/$(XGCC_PREFIX)ranlib \ ./configure \ --prefix=$(XGCC_INST_DIR)/$(XGCC_TARGET64) --static && \ - make clean && make + make clean && make cd $(BUILD_DIR)/zlib-$(VERSION_ZLIB) && \ cp -f libz.a $(XGCC_INST_DIR)/$(XGCC_TARGET64)/lib && \ cp -f zlib.h zconf.h $(XGCC_INST_DIR)/$(XGCC_TARGET64)/include chmod 644 $(XGCC_INST_DIR)/$(XGCC_TARGET64)/lib/libz.a - chmod 644 $(XGCC_INST_DIR)/$(XGCC_TARGET64)/include/zlib.h + chmod 644 $(XGCC_INST_DIR)/$(XGCC_TARGET64)/include/zlib.h chmod 644 $(XGCC_INST_DIR)/$(XGCC_TARGET64)/include/zconf.h # cd $(BUILD_DIR)/zlib-$(VERSION_ZLIB) && \ @@ -577,7 +577,7 @@ xgcc-zlib: RANLIB=$(XGCC_BINPATH)/$(XGCC_PREFIX)ranlib \ ./configure \ --prefix=$(XGCC_INST_DIR)/$(XGCC_TARGET64) --static && \ - make clean && make + make clean && make cd $(BUILD_DIR)/zlib-$(VERSION_ZLIB) && \ cp -f libz.a $(XGCC_INST_DIR)/$(XGCC_TARGET64)/lib32 && \ chmod 644 $(XGCC_INST_DIR)/$(XGCC_TARGET64)/lib32/libz.a @@ -594,7 +594,7 @@ xgcc-bzip2: cp -f libbz2.a $(XGCC_INST_DIR)/$(XGCC_TARGET64)/lib chmod 644 $(XGCC_INST_DIR)/$(XGCC_TARGET64)/include/bzlib.h chmod 644 $(XGCC_INST_DIR)/$(XGCC_TARGET64)/lib/libbz2.a - # + # cd $(UNPACK_DIR)/bzip2-$(VERSION_BZ2) && \ export PATH=$(XGCC_BINPATH)/bin:$(PATH) && \ make \ @@ -675,7 +675,7 @@ wingcc-mingw: make $(JOBS) install cd $(WINGCC_INST_DIR) && rm -f mingw && ln -s $(XGCC_TARGET64) mingw -wingcc-pthread: wingcc-pthread-32 wingcc-pthread-64 +wingcc-pthread: wingcc-pthread-32 wingcc-pthread-64 wingcc-pthread-32: rm -Rf $(BUILD_DIR)/winpthreads-32 && mkdir -p $(BUILD_DIR)/winpthreads-32 @@ -758,8 +758,8 @@ wingcc-finish: mv ../tmp/* . ;\ rm -Rf ../tmp ; find $(WINGCC_INST_DIR) -type f -name "*.py" | xargs rm -f - cd $(WINGCC_INST_DIR) && rm -Rf share - cd $(WINGCC_INST_DIR) && rm -f mingw + cd $(WINGCC_INST_DIR) && rm -Rf share + cd $(WINGCC_INST_DIR) && rm -f mingw cd $(WINGCC_INST_DIR) ;\ find . -type f -name "*.exe" | xargs $(XGCC_BINPATH)/$(XGCC_PREFIX)strip; true # @@ -782,7 +782,7 @@ wingcc-finish: cp -f ../../x86_64-w64-mingw32/lib/libgcc_s.a . cd $(WINGCC_INST_DIR)/lib/gcc/$(XGCC_TARGET64)/$(VERSION_GCC)/32 && \ cp -f ../../../x86_64-w64-mingw32/lib32/libgcc_s.a . - + wingcc-reimp: rm -Rf $(BUILD_DIR)/reimp cd $(BUILD_DIR)/ && \ @@ -844,7 +844,7 @@ wingcc-genidl: --prefix=$(WINGCC_INST_DIR) \ --host=$(XGCC_TARGET64) && \ make && \ - make install + make install wingcc-genlib: rm -Rf $(BUILD_DIR)/genlib @@ -856,7 +856,7 @@ wingcc-genlib: --prefix=$(WINGCC_INST_DIR) \ --host=$(XGCC_TARGET64) && \ make && \ - make install + make install wingcc-widl: cd $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-tools/widl && \ @@ -870,7 +870,7 @@ wingcc-widl: --prefix=$(WINGCC_INST_DIR) \ --host=$(XGCC_TARGET64) && \ make && \ - make install + make install wingcc-zlib: mkdir -p $(BUILD_DIR) @@ -884,14 +884,14 @@ wingcc-zlib: RANLIB=$(XGCC_BINPATH)/$(XGCC_PREFIX)ranlib \ ./configure \ --prefix=$(WINGCC_INST_DIR)/$(XGCC_TARGET64) --static && \ - make clean && make + make clean && make # cd $(BUILD_DIR)/zlib-$(VERSION_ZLIB) && \ cp -f libz.a $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/lib && \ cp -f zlib.h zconf.h $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/include # chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/lib/libz.a - chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/include/zlib.h + chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/include/zlib.h chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/include/zconf.h # cd $(BUILD_DIR)/zlib-$(VERSION_ZLIB) && \ @@ -901,7 +901,7 @@ wingcc-zlib: RANLIB=$(XGCC_BINPATH)/$(XGCC_PREFIX)ranlib \ ./configure \ --prefix=$(WINGCC_INST_DIR)/$(XGCC_TARGET64) --static && \ - make clean && make + make clean && make cd $(BUILD_DIR)/zlib-$(VERSION_ZLIB) && \ cp -f libz.a $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/lib32 && \ chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/lib32/libz.a @@ -917,7 +917,7 @@ wingcc-bzip2: cp -f libbz2.a $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/lib chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/include/bzlib.h chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/lib/libbz2.a - # + # cd $(UNPACK_DIR)/bzip2-$(VERSION_BZ2) && \ export PATH=$(XGCC_BINPATH)/bin:$(PATH) && \ make \ @@ -927,7 +927,7 @@ wingcc-bzip2: cp -f libbz2.a $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/lib32 chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/lib/libbz2.a -wingcc-gdb: +wingcc-gdb: rm -Rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb cd $(BUILD_DIR)/gdb && \ export PATH=$(XGCC_BINPATH):$(PATH) && \ @@ -977,4 +977,4 @@ fullclean: clean rm -Rf inst.* rm -Rf build.* rm -Rf unpack.* - + diff --git a/versions.mk.inc b/versions.mk.inc index 8d2474a..54bd4dd 100644 --- a/versions.mk.inc +++ b/versions.mk.inc @@ -2,7 +2,7 @@ SUITE = 1.8.0 VERSION_BINUTILS = 2.35 VERSION_GCC = 10.2.0 -VERSION_MINGW = 8.0.0 +VERSION_MINGW = 9.0.0 VERSION_GMP = 6.2.0 VERSION_MPC = 1.1.0 VERSION_ISL = 0.18 -- cgit v0.12