From c6a8548e532013568511c2ecea7ebc85a05bc303 Mon Sep 17 00:00:00 2001 From: "Koenig, Joerg" Date: Fri, 29 May 2020 09:01:13 +0200 Subject: make var SIMPLE_ARCHIVE_NAMES not equal 0 will produce archive filenames without any version information Change-Id: I7c3387ead925b4e7b6d09b39d4a853490a9ddac5 (cherry picked from commit 7c6b2f8bf03b9fe259b7b28552949934b6418574) --- Makefile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Makefile b/Makefile index e6dd8b3..2e2d75e 100644 --- a/Makefile +++ b/Makefile @@ -85,6 +85,8 @@ WINGCC_ROOTNAME = gcc WINGCC_INST_DIR = $(INST_BASE)/$(WINGCC_ROOTNAME) WINGCC_SYSROOT = $(INST_BASE)/$(WINGCC_ROOTNAME) +SIMPLE_ARCHIVE_NAMES = 0 + LANGUAGES = c,c++ SOURCE_PACKAGES = \ @@ -285,8 +287,13 @@ lingcc-gdb: lingcc-pack: rm -Rf $(INST_BASE)/gcc/share +ifneq ($(SIMPLE_ARCHIVE_NAMES),0) + cd $(INST_BASE) && \ + tar -zcf $(PWD)/gcc-suite-gcc-x86-linux64.tgz ./gcc +else cd $(INST_BASE) && \ tar -zcf $(PWD)/gcc-suite-$(VERSION_SUITE)-gcc-$(VERSION_GCC)-x86-linux64.tgz ./gcc +endif ############################################################################## @@ -595,8 +602,13 @@ xgcc-bzip2: xgcc-pack: rm -Rf $(XGCC_INST_DIR)/share +ifneq ($(SIMPLE_ARCHIVE_NAMES),0) + cd $(INST_BASE_LINUX) && \ + tar -zcf $(PWD)/gcc-suite-xgcc-x86-linux64.tgz ./mingw64 +else cd $(INST_BASE_LINUX) && \ tar -zcf $(PWD)/gcc-suite-$(VERSION_SUITE)-xgcc-$(VERSION_GCC)-$(VERSION_MINGW)-x86-linux64.tgz ./mingw64 +endif ############################################################################## # Nativ Multilib Windows Compiler (64 -Bit) @@ -928,8 +940,13 @@ wingcc-gdb: $(WINGCC_INST_DIR)/bin/$(XGCC_TARGET64)-gdbserver.exe wingcc-pack: rm -Rf $(WINGCC_INST_DIR)/share +ifneq ($(SIMPLE_ARCHIVE_NAMES),0) + cd $(INST_BASE) && \ + zip -qr $(PWD)/gcc-suite-gcc-x86-mingw64.zip ./$(WINGCC_ROOTNAME) +else cd $(INST_BASE) && \ zip -qr $(PWD)/gcc-suite-$(VERSION_SUITE)-gcc-$(VERSION_GCC)-$(VERSION_MINGW)-x86-mingw64.zip ./$(WINGCC_ROOTNAME) +endif # ---------------------------------------------------------------------------- # distribute: \ -- cgit v0.12