From e6ad1c510acb4d9c1ab3fda501fc24bf26e08585 Mon Sep 17 00:00:00 2001 From: Slice Date: Mon, 3 Jul 2023 19:54:03 +0300 Subject: [PATCH] new default toolset GCC131 Signed-off-by: Slice --- BaseTools/Conf/tools_def.template | 83 ++++++++++++++++++- .../Resources/templates/Localizable.strings | 8 +- CloverPackage/package/po/clover.pot | 8 +- CloverPackage/package/po/de.po | 6 +- CloverPackage/package/po/en.po | 6 +- CloverPackage/package/po/es.po | 6 +- CloverPackage/package/po/fr.po | 6 +- CloverPackage/package/po/hr.po | 10 +-- CloverPackage/package/po/id.po | 6 +- CloverPackage/package/po/it.po | 6 +- CloverPackage/package/po/ja.po | 6 +- CloverPackage/package/po/ko.po | 6 +- CloverPackage/package/po/lv.po | 6 +- CloverPackage/package/po/nl.po | 6 +- CloverPackage/package/po/pl.po | 6 +- CloverPackage/package/po/pt-BR.po | 6 +- CloverPackage/package/po/pt.po | 6 +- CloverPackage/package/po/ro.po | 6 +- CloverPackage/package/po/ru.po | 10 +-- CloverPackage/package/po/tr.po | 6 +- CloverPackage/package/po/uk.po | 10 +-- CloverPackage/package/po/uk_UA.po | 10 +-- CloverPackage/package/po/vi.po | 6 +- CloverPackage/package/po/zh_CN.po | 6 +- CloverPackage/package/po/zh_TW.po | 6 +- buildme | 12 +-- ebuild.sh | 13 +-- hebuild.sh | 13 +-- xbuildme | 4 +- 29 files changed, 184 insertions(+), 105 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 755a501eb..86879b770 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -131,6 +131,7 @@ DEFINE GCC49_X64_PREFIX = ENV(TOOLCHAIN_DIR)/cross/bin/x86_64-clover-lin DEFINE GCC53_IA32_PREFIX = ENV(GCC53_BIN) DEFINE GCC53_X64_PREFIX = ENV(GCC53_BIN) +DEFINE GCC131_X64_PREFIX = ENV(GCC131_BIN) DEFINE UNIX_IASL_BIN = ENV(IASL_PREFIX)iasl DEFINE WIN_IASL_BIN = ENV(IASL_PREFIX)iasl.exe @@ -2063,7 +2064,7 @@ DEFINE GCC49_ASLCC_FLAGS = DEF(GCC48_ASLCC_FLAGS) DEFINE GCC5_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -fno-pic -fno-pie DEFINE GCC5_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -DEFINE GCC5_IA32_X64_DLINK_COMMON = DEF(GCC49_IA32_X64_DLINK_COMMON) -Wl,--no-warn-rwx-segments +DEFINE GCC5_IA32_X64_DLINK_COMMON = DEF(GCC49_IA32_X64_DLINK_COMMON) DEFINE GCC5_IA32_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) DEFINE GCC5_IA32_X64_DLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_FLAGS) DEFINE GCC5_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS) -Wno-error @@ -2086,16 +2087,35 @@ DEFINE GCC5_ASLCC_FLAGS = DEF(GCC49_ASLCC_FLAGS) -fno-lto DEFINE GCC53_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) DEFINE GCC53_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -fno-unwind-tables -Wno-incompatible-ms-struct -Wno-misleading-indentation -mms-bitfields -fno-ms-extensions -ffreestanding -fno-exceptions -DEFINE GCC53_IA32_X64_DLINK_COMMON = -nostdlib -Wl,--no-warn-rwx-segments,--gc-sections,-n,-q,--gc-sections,-z,common-page-size=0x40,--defsym=PECOFF_HEADER_SIZE=0x240,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds +DEFINE GCC53_IA32_X64_DLINK_COMMON = -nostdlib -Wl,-n,-q,--gc-sections,-z,common-page-size=0x40,--defsym=PECOFF_HEADER_SIZE=0x240,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds DEFINE GCC53_IA32_X64_ASLDLINK_FLAGS = DEF(GCC53_IA32_X64_DLINK_COMMON),--entry,ReferenceAcpiTable,-u,ReferenceAcpiTable DEFINE GCC53_IA32_X64_DLINK_FLAGS = DEF(GCC53_IA32_X64_DLINK_COMMON),--entry,$(IMAGE_ENTRY_POINT),-u,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map -DEFINE GCC53_X64_DLINK_FLAGS = DEF(GCC53_IA32_X64_DLINK_FLAGS),-melf_x86_64,-znoexecstack,--oformat=elf64-x86-64,-pie +DEFINE GCC53_X64_DLINK_FLAGS = DEF(GCC53_IA32_X64_DLINK_FLAGS),-melf_x86_64,--oformat=elf64-x86-64,-pie DEFINE GCC53_ASM_FLAGS = DEF(GCC49_ASM_FLAGS) +DEFINE GCC131_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -fno-unwind-tables -Wno-incompatible-ms-struct -Wno-misleading-indentation -mms-bitfields -fno-ms-extensions -ffreestanding -fno-exceptions +DEFINE GCC131_IA32_X64_DLINK_COMMON = -nostdlib -Wl,--no-warn-rwx-segments,--gc-sections,-n,-q,--gc-sections,-z,common-page-size=0x40,--defsym=PECOFF_HEADER_SIZE=0x240,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds +DEFINE GCC131_IA32_X64_ASLDLINK_FLAGS = DEF(GCC131_IA32_X64_DLINK_COMMON),--entry,ReferenceAcpiTable,-u,ReferenceAcpiTable +DEFINE GCC131_IA32_X64_DLINK_FLAGS = DEF(GCC131_IA32_X64_DLINK_COMMON),--entry,$(IMAGE_ENTRY_POINT),-u,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map +DEFINE GCC131_X64_DLINK_FLAGS = DEF(GCC131_IA32_X64_DLINK_FLAGS),-melf_x86_64,-znoexecstack,--oformat=elf64-x86-64,-pie +DEFINE GCC131_ASM_FLAGS = DEF(GCC49_ASM_FLAGS) +DEFINE GCC131_ARM_ASM_FLAGS = DEF(GCC49_ARM_ASM_FLAGS) +DEFINE GCC131_AARCH64_ASM_FLAGS = DEF(GCC49_AARCH64_ASM_FLAGS) +DEFINE GCC131_ARM_CC_FLAGS = DEF(GCC49_ARM_CC_FLAGS) +DEFINE GCC131_ARM_CC_XIPFLAGS = DEF(GCC49_ARM_CC_XIPFLAGS) +DEFINE GCC131_AARCH64_CC_FLAGS = DEF(GCC49_AARCH64_CC_FLAGS) +DEFINE GCC131_AARCH64_CC_XIPFLAGS = DEF(GCC49_AARCH64_CC_XIPFLAGS) +DEFINE GCC131_ARM_DLINK_FLAGS = DEF(GCC49_ARM_DLINK_FLAGS) +DEFINE GCC131_ARM_DLINK2_FLAGS = DEF(GCC49_ARM_DLINK2_FLAGS) -Wno-error +DEFINE GCC131_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS) +DEFINE GCC131_AARCH64_DLINK2_FLAGS = DEF(GCC49_AARCH64_DLINK2_FLAGS) -Wno-error +DEFINE GCC131_ARM_ASLDLINK_FLAGS = DEF(GCC49_ARM_ASLDLINK_FLAGS) +DEFINE GCC131_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS) + #################################################################################### # @@ -2427,6 +2447,63 @@ RELEASE_GCC53_X64_CC_FLAGS = DEF(GCC53_X64_CC_FLAGS) -g3 -Os -Werror DEBUG_GCC53_X64_CXX_FLAGS = DEF(GCC53_X64_CC_FLAGS) -g3 -O0 RELEASE_GCC53_X64_CXX_FLAGS = DEF(GCC53_X64_CC_FLAGS) -g3 -Os -Werror +#################################################################################### +# +# GCC 13.1 - This configuration is used to compile under Linux/MacOSX to produce +# PE/COFF binaries using GCC 13.1. +# +#################################################################################### +*_GCC131_*_*_FAMILY = GCC +*_GCC131_*_*_BUILDRULEORDER = nasm S s + +*_GCC131_*_MAKE_PATH = make + +*_GCC131_*_*_DLL = ENV(GCC131_DLL) + +*_GCC131_X64_GCCLINK_PREFIX = -Wl, + +*_GCC131_*_ASL_PATH = DEF(UNIX_IASL_BIN) + +*_GCC131_*_NASM_PATH = ENV(NASM_PREFIX)nasm + +*_GCC131_*_PP_FLAGS = DEF(GCC_PP_FLAGS) +*_GCC131_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) +*_GCC131_*_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) +*_GCC131_*_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) +*_GCC131_*_APP_FLAGS = +*_GCC131_*_ASL_FLAGS = DEF(IASL_FLAGS) +*_GCC131_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS) + +################## +# GCC131 X64 definitions +################## +*_GCC131_X64_OBJCOPY_PATH = DEF(GCC131_X64_PREFIX)objcopy +*_GCC131_X64_CC_PATH = DEF(GCC131_X64_PREFIX)gcc +*_GCC131_X64_CXX_PATH = DEF(GCC131_X64_PREFIX)g++ +*_GCC131_X64_SLINK_PATH = DEF(GCC131_X64_PREFIX)gcc-ar +*_GCC131_X64_DLINK_PATH = DEF(GCC131_X64_PREFIX)gcc +*_GCC131_X64_ASLDLINK_PATH = DEF(GCC131_X64_PREFIX)gcc +*_GCC131_X64_ASM_PATH = DEF(GCC131_X64_PREFIX)gcc +*_GCC131_X64_PP_PATH = DEF(GCC131_X64_PREFIX)gcc +*_GCC131_X64_VFRPP_PATH = DEF(GCC131_X64_PREFIX)gcc +*_GCC131_X64_ASLCC_PATH = DEF(GCC131_X64_PREFIX)gcc +*_GCC131_X64_ASLPP_PATH = DEF(GCC131_X64_PREFIX)gcc +*_GCC131_X64_RC_PATH = DEF(GCC131_X64_PREFIX)objcopy + +*_GCC131_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 +*_GCC131_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS),-m,elf_x86_64 +*_GCC131_X64_ASM_FLAGS = DEF(GCC131_ASM_FLAGS) -m64 +*_GCC131_X64_DLINK_FLAGS = DEF(GCC131_X64_DLINK_FLAGS) DEF(GCC131_X64_CC_FLAGS) ENV(GCC131_X64_EXTRA_CC_FLAGS) +*_GCC131_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) +*_GCC131_X64_OBJCOPY_FLAGS = +*_GCC131_X64_NASM_FLAGS = -f elf64 + + DEBUG_GCC131_X64_CC_FLAGS = DEF(GCC131_X64_CC_FLAGS) -g3 -O0 +RELEASE_GCC131_X64_CC_FLAGS = DEF(GCC131_X64_CC_FLAGS) -g3 -Os -Werror + DEBUG_GCC131_X64_CXX_FLAGS = DEF(GCC131_X64_CC_FLAGS) -g3 -O0 +RELEASE_GCC131_X64_CXX_FLAGS = DEF(GCC131_X64_CC_FLAGS) -g3 -Os -Werror + + # # # XCODE5 support diff --git a/CloverPackage/package/Resources/templates/Localizable.strings b/CloverPackage/package/Resources/templates/Localizable.strings index d4dbdc877..1cd7f68c1 100644 --- a/CloverPackage/package/Resources/templates/Localizable.strings +++ b/CloverPackage/package/Resources/templates/Localizable.strings @@ -228,10 +228,10 @@ More infos https://github.com/jief666/BootloaderChooser. "; // ============================================================================ // CloverConfigPlistValidator // ---------------------------------------------------------------------------- -"CloverConfigPlistValidator_title" = "CloverConfigPlistValidator"; -"CloverConfigPlistValidator_description" = "CloverConfigPlistValidator by jief, -Verify sanity of your config.plist keeps it clean and up to date. -Installs to /usr/local/bin and will be available as 'ccpv' "; +//"CloverConfigPlistValidator_title" = "CloverConfigPlistValidator"; +//"CloverConfigPlistValidator_description" = "CloverConfigPlistValidator by jief, +//Verify sanity of your config.plist keeps it clean and up to date. +//Installs to /usr/local/bin and will be available as 'ccpv' "; // ============================================================================ // RC Scripts diff --git a/CloverPackage/package/po/clover.pot b/CloverPackage/package/po/clover.pot index 56371576f..5b85c99aa 100644 --- a/CloverPackage/package/po/clover.pot +++ b/CloverPackage/package/po/clover.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Clover r5150\n" -"POT-Creation-Date: 2022-12-17 13:55+0300\n" +"Project-Id-Version: Clover r5153\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -966,8 +966,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/de.po b/CloverPackage/package/po/de.po index 28417d24a..8b2e8ba42 100644 --- a/CloverPackage/package/po/de.po +++ b/CloverPackage/package/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2020-03-08 18:53+0100\n" "Last-Translator: vector sigma\n" "Language-Team: ge \n" @@ -1046,8 +1046,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/en.po b/CloverPackage/package/po/en.po index cd1ca7348..9c7201c43 100644 --- a/CloverPackage/package/po/en.po +++ b/CloverPackage/package/po/en.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: \n" "Last-Translator: vector sigma\n" "Language-Team: en \n" @@ -1043,8 +1043,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/es.po b/CloverPackage/package/po/es.po index a020dc276..346afa44e 100644 --- a/CloverPackage/package/po/es.po +++ b/CloverPackage/package/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2018-10-02 11:38+0200\n" "Last-Translator: vector sigma\n" "Language-Team: es \n" @@ -1055,8 +1055,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/fr.po b/CloverPackage/package/po/fr.po index a55422db6..444f659bb 100644 --- a/CloverPackage/package/po/fr.po +++ b/CloverPackage/package/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: \n" "Last-Translator: vector sigma\n" "Language-Team: en \n" @@ -1046,8 +1046,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/hr.po b/CloverPackage/package/po/hr.po index cfc425065..b84611923 100644 --- a/CloverPackage/package/po/hr.po +++ b/CloverPackage/package/po/hr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2018-10-02 11:39+0200\n" "Last-Translator: vector sigma\n" "Language-Team: hr \n" @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 2.1.1\n" "X-POOTLE-MTIME: 1392363438.0\n" @@ -1051,8 +1051,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/id.po b/CloverPackage/package/po/id.po index 143179318..985f9cafe 100644 --- a/CloverPackage/package/po/id.po +++ b/CloverPackage/package/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2019-07-20 10:15+0700\n" "Last-Translator: Badruzeus\n" "Language-Team: id \n" @@ -1059,8 +1059,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/it.po b/CloverPackage/package/po/it.po index 873857918..b930005bd 100644 --- a/CloverPackage/package/po/it.po +++ b/CloverPackage/package/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2019-07-13 10:25+0200\n" "Last-Translator: vector sigma\n" "Language-Team: it \n" @@ -1053,8 +1053,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/ja.po b/CloverPackage/package/po/ja.po index e29af3ae9..d7efea5fd 100644 --- a/CloverPackage/package/po/ja.po +++ b/CloverPackage/package/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2018-10-02 11:41+0200\n" "Last-Translator: vector sigma\n" "Language-Team: \n" @@ -1050,8 +1050,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/ko.po b/CloverPackage/package/po/ko.po index 6ff7d4e7e..9d01fa046 100644 --- a/CloverPackage/package/po/ko.po +++ b/CloverPackage/package/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: \n" "Last-Translator: vector sigma\n" "Language-Team: ko \n" @@ -1053,8 +1053,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/lv.po b/CloverPackage/package/po/lv.po index e28b15e98..cf0ea8fe5 100644 --- a/CloverPackage/package/po/lv.po +++ b/CloverPackage/package/po/lv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2018-10-02 11:42+0200\n" "Last-Translator: vector sigma\n" "Language-Team: \n" @@ -1059,8 +1059,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/nl.po b/CloverPackage/package/po/nl.po index d7dd6984f..2f1495001 100644 --- a/CloverPackage/package/po/nl.po +++ b/CloverPackage/package/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2019-07-14 12:37+0200\n" "Last-Translator: vector sigma\n" "Language-Team: \n" @@ -1048,8 +1048,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/pl.po b/CloverPackage/package/po/pl.po index b5d106eb1..2d53bbc2b 100644 --- a/CloverPackage/package/po/pl.po +++ b/CloverPackage/package/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2018-10-02 11:43+0200\n" "Last-Translator: vector sigma\n" "Language-Team: pl \n" @@ -1061,8 +1061,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/pt-BR.po b/CloverPackage/package/po/pt-BR.po index 4c28934d5..1b8106862 100644 --- a/CloverPackage/package/po/pt-BR.po +++ b/CloverPackage/package/po/pt-BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2018-10-02 11:44+0200\n" "Last-Translator: vector sigma\n" "Language-Team: pt \n" @@ -1052,8 +1052,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/pt.po b/CloverPackage/package/po/pt.po index b1ed4c246..295edb7ef 100644 --- a/CloverPackage/package/po/pt.po +++ b/CloverPackage/package/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2019-07-19 10:48+0100\n" "Last-Translator: vector sigma\n" "Language-Team: pt \n" @@ -1038,8 +1038,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/ro.po b/CloverPackage/package/po/ro.po index 57852eb60..3fbb5dc4a 100644 --- a/CloverPackage/package/po/ro.po +++ b/CloverPackage/package/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2019-07-14 21:16+0300\n" "Last-Translator: vector sigma\n" "Language-Team: ro \n" @@ -1050,8 +1050,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/ru.po b/CloverPackage/package/po/ru.po index ec4697886..a75d3d614 100644 --- a/CloverPackage/package/po/ru.po +++ b/CloverPackage/package/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: \n" "Last-Translator: vector sigma\n" "Language-Team: ru \n" @@ -16,8 +16,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "PO-Creation-Date: 2014-02-13 15:47+0000\n" "POT-Revision-Date: 2018-07-02 12:00+0500\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 2.1.1\n" "X-POOTLE-MTIME: 1392306466.0\n" @@ -1037,8 +1037,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/tr.po b/CloverPackage/package/po/tr.po index 234106375..e84f1a76e 100644 --- a/CloverPackage/package/po/tr.po +++ b/CloverPackage/package/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2018-10-02 11:46+0200\n" "Last-Translator: vector sigma\n" "Language-Team: \n" @@ -1052,8 +1052,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/uk.po b/CloverPackage/package/po/uk.po index 918607af4..56b44e7fe 100644 --- a/CloverPackage/package/po/uk.po +++ b/CloverPackage/package/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2018-10-02 11:47+0200\n" "Last-Translator: vector sigma\n" "Language-Team: ua \n" @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 2.1.1\n" "X-POOTLE-MTIME: 1392326816.0\n" @@ -1065,8 +1065,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/uk_UA.po b/CloverPackage/package/po/uk_UA.po index 71d91ebe9..59d8ab0dc 100644 --- a/CloverPackage/package/po/uk_UA.po +++ b/CloverPackage/package/po/uk_UA.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2018-10-02 11:47+0200\n" "Last-Translator: vector sigma\n" "Language-Team: ua \n" @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 2.1.1\n" "X-POOTLE-MTIME: 1392326816.0\n" @@ -1065,8 +1065,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/vi.po b/CloverPackage/package/po/vi.po index e6ebfc831..d612ef7a2 100644 --- a/CloverPackage/package/po/vi.po +++ b/CloverPackage/package/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2018-10-02 11:47+0200\n" "Last-Translator: vector sigma\n" "Language-Team: en \n" @@ -1059,8 +1059,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/zh_CN.po b/CloverPackage/package/po/zh_CN.po index ab78d57ea..17268f78c 100644 --- a/CloverPackage/package/po/zh_CN.po +++ b/CloverPackage/package/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2019-08-09 19:03-0400\n" "Last-Translator: vector sigma\n" "Language-Team: zh_CN \n" @@ -1029,8 +1029,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/CloverPackage/package/po/zh_TW.po b/CloverPackage/package/po/zh_TW.po index 27674143d..011d4f016 100644 --- a/CloverPackage/package/po/zh_TW.po +++ b/CloverPackage/package/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-15 18:25+0300\n" +"POT-Creation-Date: 2023-07-03 19:51+0300\n" "PO-Revision-Date: 2018-10-02 11:48+0200\n" "Last-Translator: vector sigma\n" "Language-Team: zh_TW \n" @@ -1053,8 +1053,8 @@ msgstr "" #, no-wrap msgid "" "CloverConfigPlistValidator by jief,\n" -"Verify sanity of your config.plist keeps it clean and up to date.\n" -"Installs to /usr/local/bin and will be available as 'ccpv' " +"//Verify sanity of your config.plist keeps it clean and up to date.\n" +"//Installs to /usr/local/bin and will be available as 'ccpv' " msgstr "" #. type: "rc.scripts.on.target_title" diff --git a/buildme b/buildme index be8002487..1fb9ca8bb 100755 --- a/buildme +++ b/buildme @@ -6,7 +6,7 @@ # Linux users should be able to use this wrapper, although the following are needed: # (Ubuntu alike) -# sudo apt-get install build-essential uuid-dev iasl git gcc-10 nasm python3-distutils +# sudo apt-get install build-essential uuid-dev iasl git gcc-9 nasm python3-distutils # $1 argument override MYTOOLCHAIN variable, in case you want GCC53 for example # ====== COLORS ====== @@ -23,7 +23,7 @@ COL_RESET="\x1b[39;49;00m" cd "$(dirname $([ -L $0 ] && readlink $0 || echo $0))" declare -r CLOVERROOT="$PWD" declare -r SYSNAME="$(uname)" -MYTOOLCHAIN=${1:-GCC53} +MYTOOLCHAIN=${1:-GCC131} revision=$(git describe --tags $(git rev-list --tags --max-count=1)) lsha1="not a git repo" pyversion=$(echo $COL_CYAN"Installed Python version: "$COL_WHITE$($(which python3) --version)) @@ -102,9 +102,9 @@ checkTools() { if [[ "$SYSNAME" == Darwin ]]; then checkXCODE exportPaths - local GCC53_BIN="$PREFIX/cross/bin/x86_64-clover-linux-gnu-gcc" - if [[ $MYTOOLCHAIN == GCC* ]] && [[ ! -x "${GCC53_BIN}" ]]; then - if [[ $MYTOOLCHAIN == GCC53 ]]; then + local GCC131_BIN="$PREFIX/cross/bin/x86_64-clover-linux-gnu-gcc" + if [[ $MYTOOLCHAIN == GCC* ]] && [[ ! -x "${GCC131_BIN}" ]]; then + if [[ $MYTOOLCHAIN == GCC131 ]]; then cd "${CLOVERROOT}" ./build_gcc13.sh else @@ -277,7 +277,7 @@ buildtestsev() { cd "${CLOVERROOT}" echo "[BUILD CLOVERDB]" - ./ebuild.sh -t GCC53 -mc + ./ebuild.sh -t GCC131 -mc } diff --git a/ebuild.sh b/ebuild.sh index 1cf0f5c6c..f448e4d28 100755 --- a/ebuild.sh +++ b/ebuild.sh @@ -307,6 +307,7 @@ checkCmdlineArguments() { -gcc49 | --gcc49) TOOLCHAIN=GCC49 ;; -GCC53 | --GCC53) TOOLCHAIN=GCC53 ;; -gcc53 | --gcc53) TOOLCHAIN=GCC53 ;; + -gcc131 | --gcc131) TOOLCHAIN=GCC131 ;; -xcode | --xcode ) TOOLCHAIN=XCODE32 ;; -x64 | --x64) printf "\`%s' is deprecated because Clover is 64 bit only. This message will be removed soon\n" "$option" 1>&2 @@ -320,12 +321,12 @@ checkCmdlineArguments() { # -d | -debug | --debug) BUILDTARGET=DEBUG ;; # -r | -release | --release) BUILDTARGET=RELEASE ;; -a) TARGETARCH=$(argument $option "$@") - printf "\`%s' is deprecated because Clover is 64 bit only. This message will be removed soon\n" "$option" 1>&2 - sleep 4 +# printf "\`%s' is deprecated because Clover is 64 bit only. This message will be removed soon\n" "$option" 1>&2 +# sleep 4 ;; --arch=*) - printf "\`%s' is deprecated because Clover is 64 bit only. This message will be removed soon\n" "$option" 1>&2 - sleep 4 +# printf "\`%s' is deprecated because Clover is 64 bit only. This message will be removed soon\n" "$option" 1>&2 +# sleep 4 ;; -p) PLATFORMFILE=$(argument $option "$@"); shift ;; @@ -425,8 +426,8 @@ checkToolchain() { exit 1 fi else - export GCC53_BIN="$TOOLCHAIN_DIR/cross/bin/x86_64-clover-linux-gnu-" - if [[ $TOOLCHAIN == GCC* ]] && [[ ! -x "${GCC53_BIN}gcc" ]]; then + export GCC131_BIN="$TOOLCHAIN_DIR/cross/bin/x86_64-clover-linux-gnu-" + if [[ $TOOLCHAIN == GCC* ]] && [[ ! -x "${GCC131_BIN}gcc" ]]; then echo "No clover toolchain found !" >&2 echo "Build it with the build_gcc9.sh script or define the TOOLCHAIN_DIR variable." >&2 exit 1 diff --git a/hebuild.sh b/hebuild.sh index 985b6d196..aa3b3308a 100755 --- a/hebuild.sh +++ b/hebuild.sh @@ -40,7 +40,7 @@ M_NOGRUB=0 M_APPLEHFS=0 # Default values -export TOOLCHAIN=GCC53 +export TOOLCHAIN=GCC131 export TARGETARCH=X64 export BUILDTARGET=RELEASE export BUILDTHREADS=$(( NUMBER_OF_CPUS + 1 )) @@ -307,9 +307,10 @@ checkCmdlineArguments() { -gcc49 | --gcc49) TOOLCHAIN=GCC49 ;; -GCC53 | --GCC53) TOOLCHAIN=GCC53 ;; -gcc53 | --gcc53) TOOLCHAIN=GCC53 ;; + -gcc131 | --gcc131) TOOLCHAIN=GCC131 ;; -x64 | --x64) - printf "\`%s' is deprecated because Clover is 64 bit only. This message will be removed soon\n" "$option" 1>&2 - sleep 4 +# printf "\`%s' is deprecated because Clover is 64 bit only. This message will be removed soon\n" "$option" 1>&2 +# sleep 4 ;; -mc | --x64-mcp) USE_BIOS_BLOCKIO=1 ;; -clean) TARGETRULE=clean ;; @@ -424,10 +425,10 @@ checkToolchain() { exit 1 fi else - export GCC53_BIN="$TOOLCHAIN_DIR/cross/bin/x86_64-clover-linux-gnu-" - if [[ $TOOLCHAIN == GCC* ]] && [[ ! -x "${GCC53_BIN}gcc" ]]; then + export GCC131_BIN="$TOOLCHAIN_DIR/cross/bin/x86_64-clover-linux-gnu-" + if [[ $TOOLCHAIN == GCC* ]] && [[ ! -x "${GCC131_BIN}gcc" ]]; then echo "No clover toolchain found !" >&2 - echo "Build it with the build_gcc9.sh script or define the TOOLCHAIN_DIR variable." >&2 + echo "Build it with the build_gcc13.sh script or define the TOOLCHAIN_DIR variable." >&2 exit 1 fi fi diff --git a/xbuildme b/xbuildme index c24bfeeb0..cfcf33187 100755 --- a/xbuildme +++ b/xbuildme @@ -13,7 +13,7 @@ cd "$(dirname $0)" declare -r CLOVERROOT="$PWD" -declare -r MYTOOLCHAIN=${1:-GCC53} +declare -r MYTOOLCHAIN=${1:-GCC131} TOOLCHAIN_DIR=${TOOLCHAIN_DIR:-$(dirname $CLOVERROOT)/opt/local} @@ -196,7 +196,7 @@ if [[ -d .git ]]; then lsha1=$(git rev-parse --short HEAD) fi -echo "buildme, Clover v2.5k r$(cat vers.txt) (SHA: $lsha1)" +echo "buildme, Clover v5 r$(cat vers.txt) (SHA: $lsha1)" echo "TOOLCHAIN: $MYTOOLCHAIN (override example: './buildme GCC53')" echo PS3='Please enter your choice: '