From 4a33031219cde3ec84098d281bf93bf386842742 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Thu, 6 Sep 2018 23:59:50 +0200
Subject: [PATCH] - libglib2: fix build; align patch

---
 archive-patches/libglib2-disable-tests.patch |  4 ++--
 make/system-libs.mk                          | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/archive-patches/libglib2-disable-tests.patch b/archive-patches/libglib2-disable-tests.patch
index 523ebb35..423ae3ef 100644
--- a/archive-patches/libglib2-disable-tests.patch
+++ b/archive-patches/libglib2-disable-tests.patch
@@ -23,7 +23,7 @@ index 008ad58..007332d 100644
  ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
  
 -SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
++SUBDIRS = . m4macros glib gmodule gthread gobject gio
  DIST_SUBDIRS = $(SUBDIRS) build win32
  
  bin_SCRIPTS = glib-gettextize
@@ -31,7 +31,7 @@ diff --git a/gio/Makefile.am b/gio/Makefile.am
 index 67db1b7..78309b5 100644
 --- a/gio/Makefile.am
 +++ b/gio/Makefile.am
-@@ -244,7 +244,7 @@ platform_libadd += win32/libgiowin32.la
+@@ -253,7 +253,7 @@ platform_libadd += win32/libgiowin32.la
  platform_deps += win32/libgiowin32.la
  endif
  
diff --git a/make/system-libs.mk b/make/system-libs.mk
index e9f44db1..9a087b53 100644
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@@ -1022,14 +1022,18 @@ ifeq ($(BOXSERIES), hd1)
 	LIBGLIB2_CONF = --enable-static --disable-shared
 endif
 
+LIBGLIB2_PATCH  = libglib2-disable-tests.patch
+
 $(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D)/libffi | $(TARGET_DIR)
 	$(REMOVE)/glib-$(GLIB_VER)
 	$(UNTAR)/glib-$(GLIB_VER).tar.xz
-	cd $(BUILD_TMP)/glib-$(GLIB_VER); \
-		$(PATCH)/libglib2-disable-tests.patch; \
+	$(CHDIR)/glib-$(GLIB_VER); \
+		$(call apply_patches, $(LIBGLIB2_PATCH)); \
 		echo "ac_cv_type_long_long=yes"		 > arm-linux.cache; \
 		echo "glib_cv_stack_grows=no"		>> arm-linux.cache; \
 		echo "glib_cv_uscore=no"		>> arm-linux.cache; \
+		echo "glib_cv_va_copy=no"		>> arm-linux.cache; \
+		echo "glib_cv_va_val_copy=yes"		>> arm-linux.cache; \
 		echo "ac_cv_func_posix_getpwuid_r=yes"	>> arm-linux.cache; \
 		echo "ac_cv_func_posix_getgrgid_r=yes"	>> arm-linux.cache; \
 		autoreconf -fi; \
@@ -1037,14 +1041,16 @@ $(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D
 			--prefix= \
 			--datarootdir=/.remove \
 			--cache-file=arm-linux.cache \
-			--enable-debug=no \
+			--disable-debug \
 			--disable-selinux \
-			--enable-libmount=no \
+			--disable-libmount \
 			--disable-fam \
+			--disable-gtk-doc \
+			--disable-gtk-doc-html \
+			--with-threads="posix" \
 			--with-pcre=internal \
 			$(LIBGLIB2_CONF) \
 			; \
-		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	rm -rf $(TARGET_DIR)/bin/gapplication
 	rm -rf $(TARGET_DIR)/bin/gdbus*