From 5951ccd4a6aa067d22b9e7713c99be85e4b99895 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 26 Mar 2022 10:18:30 +0900 Subject: [PATCH] glib: Do not use overflow builtins for arm to prevent `__multi3` from being emitted. Fixes https://github.com/termux/termux-packages/issues/9571. --- packages/gdk-pixbuf/build.sh | 1 + packages/glib/build.sh | 1 + packages/glib/glib-gtypes.h.patch | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 packages/glib/glib-gtypes.h.patch diff --git a/packages/gdk-pixbuf/build.sh b/packages/gdk-pixbuf/build.sh index 724f855dd..5a2b6f441 100644 --- a/packages/gdk-pixbuf/build.sh +++ b/packages/gdk-pixbuf/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library for image loading and manipulation" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.42.8 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/archive/${TERMUX_PKG_VERSION}/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e1ed2b86a2196fbc4da94256f275df4df3f74e5669ce50d224cd28636863be82 TERMUX_PKG_DEPENDS="glib, libpng, libtiff, libjpeg-turbo, zstd" diff --git a/packages/glib/build.sh b/packages/glib/build.sh index 5ec770432..a54c601a6 100644 --- a/packages/glib/build.sh +++ b/packages/glib/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" _MAJOR_VERSION=2.72 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d TERMUX_PKG_DEPENDS="libffi, libiconv, pcre, libandroid-support, zlib" diff --git a/packages/glib/glib-gtypes.h.patch b/packages/glib/glib-gtypes.h.patch new file mode 100644 index 000000000..7de4af64e --- /dev/null +++ b/packages/glib/glib-gtypes.h.patch @@ -0,0 +1,13 @@ +--- a/glib/gtypes.h ++++ b/glib/gtypes.h +@@ -429,6 +429,10 @@ + #endif + #endif + ++#if defined __clang__ && defined __arm__ ++#undef _GLIB_HAVE_BUILTIN_OVERFLOW_CHECKS ++#endif ++ + #ifdef _GLIB_HAVE_BUILTIN_OVERFLOW_CHECKS + + #define g_uint_checked_add(dest, a, b) \