From 493946871942068150bd2b2d10c5c42d7e91b862 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Fri, 8 Nov 2024 00:24:55 +0800 Subject: [PATCH] gcc-13: bump to 13.3.0 --- common-files/prebuilt-gcc.json | 12 ++++++------ ...ed.patch => 0006-use-libc++_shared.patch.disable} | 0 tur/gcc-13/0010-fix-ginclude-limits.h.patch | 11 +++++++++++ tur/gcc-13/build.sh | 8 ++++---- 4 files changed, 21 insertions(+), 10 deletions(-) rename tur/gcc-13/{0006-use-libc++_shared.patch => 0006-use-libc++_shared.patch.disable} (100%) create mode 100644 tur/gcc-13/0010-fix-ginclude-limits.h.patch diff --git a/common-files/prebuilt-gcc.json b/common-files/prebuilt-gcc.json index 283af320a..842a588dd 100644 --- a/common-files/prebuilt-gcc.json +++ b/common-files/prebuilt-gcc.json @@ -10,13 +10,13 @@ } }, "13": { - "version": "13.2.0", - "revision": "2", + "version": "13.3.0", + "revision": "0", "checksums": { - "aarch64": "509ab790566627af1b88101acf2e6f5c81da8291aa5637cc96e5e67cee90618c", - "arm": "cbcfb10ce0cd5a65a9c8611f90603e526353fef8eb8dfaf334b2c9e0fec7a3c9", - "i686": "d6252a055a818ca3dbbbe24be052e6d49082d687124bb160e6c5c7126a16da4c", - "x86_64": "af9d3f8beb1e98f7c62f63aa4b8ccd44561e961d113e789fa06e38b11e3c7710" + "aarch64": "5b6d7a8da87042c92412930a6450b057b5b20d68391e9268c9e461d4118d7f8d", + "arm": "83adfb6302b8a1a655f971cff2f77c048c1db74df5abe02007227845c2a68a10", + "i686": "2bddb9c05434411179cb3bacbd07d500aa8c7cce1db9c1831b6528f4069ba01b", + "x86_64": "e31d1d1ce93270ca455daaa3e865a4190f6558f9947396330dc1ed0afcedffca" } }, "12": { diff --git a/tur/gcc-13/0006-use-libc++_shared.patch b/tur/gcc-13/0006-use-libc++_shared.patch.disable similarity index 100% rename from tur/gcc-13/0006-use-libc++_shared.patch rename to tur/gcc-13/0006-use-libc++_shared.patch.disable diff --git a/tur/gcc-13/0010-fix-ginclude-limits.h.patch b/tur/gcc-13/0010-fix-ginclude-limits.h.patch new file mode 100644 index 000000000..332b8542c --- /dev/null +++ b/tur/gcc-13/0010-fix-ginclude-limits.h.patch @@ -0,0 +1,11 @@ +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -553,7 +553,7 @@ + STMP_FIXINC = @STMP_FIXINC@ + + # Test to see whether exists in the system header files. +-LIMITS_H_TEST = [ -f $(BUILD_SYSTEM_HEADER_DIR)/limits.h ] ++LIMITS_H_TEST = [ -f /dev/null ] + + # Directory for prefix to system directories, for + # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc. diff --git a/tur/gcc-13/build.sh b/tur/gcc-13/build.sh index 6a9b5589c..3a5662be2 100644 --- a/tur/gcc-13/build.sh +++ b/tur/gcc-13/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://gcc.gnu.org/ TERMUX_PKG_DESCRIPTION="GNU C compiler" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_DEPENDS="binutils, libc++, libgmp, libmpfr, libmpc, libisl, zlib" -TERMUX_PKG_VERSION=13.2.0 +TERMUX_PKG_VERSION=13.3.0 TERMUX_PKG_MAINTAINER="@licy183" -TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/gcc/gcc-${TERMUX_PKG_VERSION}/gcc-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=8cb4be3796651976f94b9356fa08d833524f62420d6292c5033a9a26af315078 +TERMUX_PKG_SRCURL=https://mirrors.ustc.edu.cn/gnu//gcc/gcc-${TERMUX_PKG_VERSION}/gcc-${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=3a2b10cab86e32358fdac871546d57e2700e9bdb5875ef33fff5b601265b9e32 TERMUX_PKG_BREAKS="binutils-is-llvm" TERMUX_PKG_NO_STATICSPLIT=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="\ @@ -96,5 +96,5 @@ termux_step_post_make_install() { # Copy the build spec file cp $TERMUX_PKG_TMPDIR/specs $TERMUX_PREFIX/lib/gcc/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_VERSION/ # Avoid extract `ndk-sysroot-gcc-compact` at building time. - TERMUX_PKG_DEPENDS+=", ndk-sysroot-gcc-compact" + TERMUX_PKG_DEPENDS+=", ndk-sysroot-gcc-compact (>= 26b-3)" }