diff options
| author | Adam Duskett <Aduskett@gmail.com> | 2017-06-21 17:01:03 -0400 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-06-24 12:11:09 +0200 |
| commit | 6186f0156789e5c7a468c2ba379b3fac795d01cb (patch) | |
| tree | 0f8b69b9d19412c2fcfa0d8cbc1c832175135bcd /package/libglib2/0002-disable-tests.patch | |
| parent | 568cc42f688957d8517ccd85812f2c841cc5101f (diff) | |
| download | buildroot-6186f0156789e5c7a468c2ba379b3fac795d01cb.tar.gz buildroot-6186f0156789e5c7a468c2ba379b3fac795d01cb.zip | |
libglib2: bump version to 2.52.2
Patches were changed to git format, because libglib is a git project.
0003-gio-2.0.pc-include-libmount-in-Libs.private.patch was added to upstream
as of commit:
https://git.gnome.org/browse/glib/commit/?id=ecdd3c29fc4bd28f01fe53d0528bfee888c9c62c.
Signed-off-by: Adam Duskett <aduskett@codeblue.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/libglib2/0002-disable-tests.patch')
| -rw-r--r-- | package/libglib2/0002-disable-tests.patch | 57 |
1 files changed, 37 insertions, 20 deletions
diff --git a/package/libglib2/0002-disable-tests.patch b/package/libglib2/0002-disable-tests.patch index 1b0c535571..523ebb35ac 100644 --- a/package/libglib2/0002-disable-tests.patch +++ b/package/libglib2/0002-disable-tests.patch @@ -1,12 +1,37 @@ +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 -Nura glib-2.46.1.orig/gio/Makefile.am glib-2.46.1/gio/Makefile.am ---- glib-2.46.1.orig/gio/Makefile.am 2015-10-20 16:59:03.042212468 -0300 -+++ glib-2.46.1/gio/Makefile.am 2015-10-20 17:32:26.763146133 -0300 -@@ -233,7 +233,7 @@ +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 @@ -15,10 +40,11 @@ diff -Nura glib-2.46.1.orig/gio/Makefile.am glib-2.46.1/gio/Makefile.am if HAVE_FAM SUBDIRS += fam -diff -Nura glib-2.46.1.orig/glib/Makefile.am glib-2.46.1/glib/Makefile.am ---- glib-2.46.1.orig/glib/Makefile.am 2015-10-20 16:59:03.066213318 -0300 -+++ glib-2.46.1/glib/Makefile.am 2015-10-20 17:33:23.537155988 -0300 -@@ -33,8 +33,8 @@ +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 @@ -29,15 +55,6 @@ diff -Nura glib-2.46.1.orig/glib/Makefile.am glib-2.46.1/glib/Makefile.am AM_CPPFLAGS = \ $(glib_INCLUDES) \ -diff -Nura glib-2.46.1.orig/Makefile.am glib-2.46.1/Makefile.am ---- glib-2.46.1.orig/Makefile.am 2015-10-20 16:59:03.003211087 -0300 -+++ glib-2.46.1/Makefile.am 2015-10-20 17:32:20.923939420 -0300 -@@ -6,7 +6,7 @@ - - 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 - - bin_SCRIPTS = glib-gettextize +-- +2.9.4 + |
