From 2b8e549f8e763fcd37e61177c38346e8a636a437 Mon Sep 17 00:00:00 2001 From: Jitao Lu Date: Sun, 11 Jun 2023 21:01:18 +0800 Subject: [PATCH] glib2: disable gnulib printf A compiler bug (suspiciously) blocks gnulib compilation for mipsel_24kc_24kf. While we had this patch to disable gnulib, it was accidentally removed by 5d27631d9fbca076eb6377fc8c10f474ce9f4fea. Add it back to fix the long broken build for mipsel_24kc_24kf. Fixes: #19511 Signed-off-by: Jitao Lu (cherry picked from commit 68f23a9c333671e9ea69e014824943e2e00aaa41) --- libs/glib2/Makefile | 2 +- libs/glib2/patches/006-c99.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 libs/glib2/patches/006-c99.patch diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index 107b5b35ed..e748244f28 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=2.74.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@GNOME/glib/$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION))) +PKG_SOURCE_URL:=@GNOME/glib/$(basename $(PKG_VERSION)) PKG_HASH:=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30 PKG_MAINTAINER:=Peter Wagner diff --git a/libs/glib2/patches/006-c99.patch b/libs/glib2/patches/006-c99.patch new file mode 100644 index 0000000000..de348d3850 --- /dev/null +++ b/libs/glib2/patches/006-c99.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -1045,7 +1045,7 @@ if host_system == 'windows' and (cc.get_ + glib_conf.set('HAVE_C99_SNPRINTF', false) + glib_conf.set('HAVE_C99_VSNPRINTF', false) + glib_conf.set('HAVE_UNIX98_PRINTF', false) +-elif not cc_can_run and host_system in ['ios', 'darwin'] ++elif true + # All these are true when compiling natively on macOS, so we should use good + # defaults when building for iOS and tvOS. + glib_conf.set('HAVE_C99_SNPRINTF', true)