From f5e7a83c88cb25775a5329a12a72c5e82b9b8fa3 Mon Sep 17 00:00:00 2001
From: Arthur Liberman <arthur_liberman@hotmail.com>
Date: Sat, 27 Mar 2021 14:56:27 +0300
Subject: [PATCH] glib: fix build on an aarch64 system for ARCH=arm

---
 config/functions               | 12 ++++++++----
 packages/devel/glib/package.mk |  8 +++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/config/functions b/config/functions
index 9ad285b230..9b2ccb6705 100644
--- a/config/functions
+++ b/config/functions
@@ -482,12 +482,14 @@ cpu_family = '$TARGET_ARCH'
 cpu = '$TARGET_SUBARCH'
 endian = 'little'
 
-[properties]
-root = '$TOOLCHAIN'
+[built-in options]
 $(python3 -c "import os; print('c_args = {}'.format([x for x in os.getenv('CFLAGS').split()]))")
 $(python3 -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))")
 $(python3 -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('CXXFLAGS').split()]))")
 $(python3 -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))")
+
+[properties]
+root = '$TOOLCHAIN'
 ${!properties}
 EOF
 }
@@ -512,12 +514,14 @@ cpu_family = '$TARGET_ARCH'
 cpu = '$TARGET_SUBARCH'
 endian = 'little'
 
-[properties]
-root = '$SYSROOT_PREFIX/usr'
+[built-in options]
 $(python3 -c "import os; print('c_args = {}'.format([x for x in os.getenv('TARGET_CFLAGS').split()]))")
 $(python3 -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))")
 $(python3 -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('TARGET_CXXFLAGS').split()]))")
 $(python3 -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))")
+
+[properties]
+root = '$SYSROOT_PREFIX/usr'
 ${!properties}
 EOF
 }
diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk
index c157de8206..8f60091db1 100644
--- a/packages/devel/glib/package.mk
+++ b/packages/devel/glib/package.mk
@@ -33,11 +33,9 @@ PKG_MESON_OPTS_TARGET="-Ddefault_library=shared \
                        -Dforce_posix_threads=true \
                        -Dtests=false"
 
-PKG_MESON_PROPERTIES_TARGET="
-have_c99_vsnprintf=false
-have_c99_snprintf=false
-growing_stack=false
-va_val_copy=false"
+if [ "${MACHINE_HARDWARE_NAME}" = "aarch64" -a "${TARGET_ARCH}" = "arm" ]; then
+  PKG_MESON_PROPERTIES_TARGET="needs_exe_wrapper = true"
+fi
 
 post_makeinstall_target() {
   rm -rf ${INSTALL}/usr/bin