- rename libglib to libglib2

archive-patches/libglib2-disable-tests.patch

@@ -0,0 +1,60 @@
+From ee2d6609bce808ac72afdbf86db1a6e27c78171e Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
+Date: Wed, 21 Jun 2017 16:37:54 -0400
+Subject: [PATCH] disable tests
+
+Disable tests, some of them need python and sometimes host-python
+gets mixed with distro python leading to build failures.
+
+Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
+Signed-off-by: Adam Duskett <aduskett@codeblue.com>
+---
+ Makefile.am      | 2 +-
+ gio/Makefile.am  | 2 +-
+ glib/Makefile.am | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 008ad58..007332d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,7 @@ include $(top_srcdir)/glib.mk
+ 
+ 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
+ DIST_SUBDIRS = $(SUBDIRS) build win32
+ 
+ bin_SCRIPTS = glib-gettextize
+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
+ platform_deps += win32/libgiowin32.la
+ endif
+ 
+-SUBDIRS += . tests
++SUBDIRS += .
+ 
+ if HAVE_FAM
+ SUBDIRS += fam
+diff --git a/glib/Makefile.am b/glib/Makefile.am
+index d755853..61166e5 100644
+--- a/glib/Makefile.am
++++ b/glib/Makefile.am
+@@ -33,8 +33,8 @@ else
+ MAYBE_PCRE = pcre 
+ endif
+ 
+-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
+-DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
++SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
++DIST_SUBDIRS = libcharset gnulib pcre update-pcre
+ 
+ AM_CPPFLAGS = 				\
+ 	$(glib_INCLUDES) 		\
+-- 
+2.9.4
+

make/gstreamer.mk

@@ -19,7 +19,7 @@ GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VER).tar.xz
 $(ARCHIVE)/$(GSTREAMER_SOURCE):
 	$(WGET) https://gstreamer.freedesktop.org/src/gstreamer/$(GSTREAMER_SOURCE)
 
-$(D)/gstreamer: $(D)/libglib $(D)/libxml2 $(D)/glib_networking $(ARCHIVE)/$(GSTREAMER_SOURCE)
+$(D)/gstreamer: $(D)/libglib2 $(D)/libxml2 $(D)/glib_networking $(ARCHIVE)/$(GSTREAMER_SOURCE)
 	$(UNTAR)/$(GSTREAMER_SOURCE)
 	set -e; cd $(BUILD_TMP)/gstreamer-$(GSTREAMER_VER); \
 		$(PATCH)/gstreamer-$(GSTREAMER_VER)-revert-use-new-gst-adapter-get-buffer.patch; \
@@ -66,7 +66,7 @@ GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VER).tar.xz
 $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE):
 	$(WGET) https://gstreamer.freedesktop.org/src/gst-plugins-base/$(GST_PLUGINS_BASE_SOURCE)
 
-$(D)/gst_plugins_base: $(D)/zlib $(D)/libglib $(D)/orc $(D)/gstreamer $(D)/alsa_lib $(D)/libogg $(D)/libvorbisidec $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE)
+$(D)/gst_plugins_base: $(D)/zlib $(D)/libglib2 $(D)/orc $(D)/gstreamer $(D)/alsa_lib $(D)/libogg $(D)/libvorbisidec $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE)
 	$(UNTAR)/$(GST_PLUGINS_BASE_SOURCE)
 	set -e; cd $(BUILD_TMP)/gst-plugins-base-$(GST_PLUGINS_BASE_VER); \
 		$(PATCH)/gst-plugins-base-$(GSTREAMER_VER)-Makefile.am-don-t-hardcode-libtool-name-when-running.patch; \
@@ -461,7 +461,7 @@ GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VER).tar.xz
 $(ARCHIVE)/$(GLIB_NETWORKING_SOURCE):
 	$(WGET) https://ftp.acc.umu.se/pub/GNOME/sources/glib-networking/$(GLIB_NETWORKING_VER_MAJOR)/$(GLIB_NETWORKING_SOURCE)
 
-$(D)/glib_networking: $(D)/gnutls $(D)/libglib $(ARCHIVE)/$(GLIB_NETWORKING_SOURCE)
+$(D)/glib_networking: $(D)/gnutls $(D)/libglib2 $(ARCHIVE)/$(GLIB_NETWORKING_SOURCE)
 	$(UNTAR)/$(GLIB_NETWORKING_SOURCE)
 	set -e; cd $(BUILD_TMP)/glib-networking-$(GLIB_NETWORKING_VER); \
 		$(CONFIGURE) \
@@ -524,7 +524,7 @@ LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VER).tar.xz
 $(ARCHIVE)/$(LIBSOUP_SOURCE):
 	$(WGET) https://download.gnome.org/sources/libsoup/$(LIBSOUP_VER_MAJOR)/$(LIBSOUP_SOURCE)
 
-$(D)/libsoup: $(D)/sqlite $(D)/libxml2 $(D)/libglib $(ARCHIVE)/$(LIBSOUP_SOURCE)
+$(D)/libsoup: $(D)/sqlite $(D)/libxml2 $(D)/libglib2 $(ARCHIVE)/$(LIBSOUP_SOURCE)
 	$(UNTAR)/$(LIBSOUP_SOURCE)
 	set -e; cd $(BUILD_TMP)/libsoup-$(LIBSOUP_VER); \
 		$(CONFIGURE) \

make/system-libs.mk

@@ -1044,19 +1044,20 @@ $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz
 # glibc provides a stub
 # gettext implementation,
 # so we only build it for hd2
-LIBGLIB_DEPS =
+LIBGLIB2_DEPS =
 ifeq ($(BOXSERIES), hd2)
-	LIBGLIB_DEPS = $(D)/gettext
+	LIBGLIB2_DEPS = $(D)/gettext
 endif
 
-LIBGLIB_CONF =
+LIBGLIB2_CONF =
 ifeq ($(BOXSERIES), hd1)
-	LIBGLIB_CONF = --enable-static --disable-shared
+	LIBGLIB2_CONF = --enable-static --disable-shared
 endif
 
-$(D)/libglib: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB_DEPS) $(D)/libffi | $(TARGETPREFIX)
+$(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D)/libffi | $(TARGETPREFIX)
 	$(UNTAR)/glib-$(GLIB_VER).tar.xz
 	pushd $(BUILD_TMP)/glib-$(GLIB_VER); \
+	$(PATCH)/libglib2-disable-tests.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; \
@@ -1072,7 +1073,7 @@ $(D)/libglib: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB_DEPS) $(D)/
 			--enable-libmount=no \
 			--disable-fam \
 			--with-pcre=internal \
-			$(LIBGLIB_CONF) \
+			$(LIBGLIB2_CONF) \
 			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGETPREFIX)

make/system-tools.mk

@@ -845,7 +845,7 @@ $(D)/exfat-utils: $(ARCHIVE)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz $(D)/fuse-exf
 	$(REMOVE)/exfat-utils-$(EXFAT_UTILS_VER)
 	touch $@
 
-$(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/libglib | $(TARGETPREFIX)
+$(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/libglib2 | $(TARGETPREFIX)
 	$(REMOVE)/$(NI_STREAMRIPPER)
 	tar -C $(SOURCE_DIR) -cp $(NI_STREAMRIPPER) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	pushd $(BUILD_TMP)/$(NI_STREAMRIPPER); \
@@ -889,7 +889,7 @@ $(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz | $(TARGETPREFIX)
 	$(REMOVE)/gettext-$(GETTEXT_VERSION)
 	touch $@
 
-$(D)/mc: $(ARCHIVE)/mc-$(MC-VER).tar.xz $(D)/libglib $(D)/libncurses | $(TARGETPREFIX)
+$(D)/mc: $(ARCHIVE)/mc-$(MC-VER).tar.xz $(D)/libglib2 $(D)/libncurses | $(TARGETPREFIX)
 	$(REMOVE)/mc-$(MC-VER)
 	$(UNTAR)/mc-$(MC-VER).tar.xz
 	pushd $(BUILD_TMP)/mc-$(MC-VER); \