NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94e7a91092
kumquat-buildroot/package/libglib2/0002-disable-tests.patch

61 lines
1.7 KiB
Diff
Raw Normal View History

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>
2017-06-21 23:01:03 +02:00
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
libglib2: disable tests and update configure options Sometimes if host-python is around it doesn't work too well with the distro python (Gentoo, FC20 at least) leading to build failures. This failure is very hard to trigger, it's normally easier to do so by enabling top-level parallel builds. Fixes: http://autobuild.buildroot.net/results/0f8/0f881e322b7f9d244b8dd2440ba0afd3a8418027/ While at it update the configure options to avoid any host libraries/tools from leaking in, new naming conventions and options. And remove dead code dealing with the nothreaded variant. Signed-off-by: Gustavo Zacarias <gustavozacarias@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-10-21 00:40:55 +02:00
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>
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>
2017-06-21 23:01:03 +02:00
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(-)
libglib2: disable tests and update configure options Sometimes if host-python is around it doesn't work too well with the distro python (Gentoo, FC20 at least) leading to build failures. This failure is very hard to trigger, it's normally easier to do so by enabling top-level parallel builds. Fixes: http://autobuild.buildroot.net/results/0f8/0f881e322b7f9d244b8dd2440ba0afd3a8418027/ While at it update the configure options to avoid any host libraries/tools from leaking in, new naming conventions and options. And remove dead code dealing with the nothreaded variant. Signed-off-by: Gustavo Zacarias <gustavozacarias@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-10-21 00:40:55 +02:00
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>
2017-06-21 23:01:03 +02:00
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}
Revert "package/libglib2: bump to version 2.58.1" This reverts commit 178eb1d7ea165d87460224d297ce615bb63090f0. This bump causes too many build failures in reverse dependencies of libglib2, for which a proper solution needs to be found. See also the analysis from Yann E. Morin: http://lists.busybox.net/pipermail/buildroot/2018-December/237663.html Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-03 08:55:53 +01:00
-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
DIST_SUBDIRS = $(SUBDIRS) build win32
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>
2017-06-21 23:01:03 +02:00
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
libglib2: disable tests and update configure options Sometimes if host-python is around it doesn't work too well with the distro python (Gentoo, FC20 at least) leading to build failures. This failure is very hard to trigger, it's normally easier to do so by enabling top-level parallel builds. Fixes: http://autobuild.buildroot.net/results/0f8/0f881e322b7f9d244b8dd2440ba0afd3a8418027/ While at it update the configure options to avoid any host libraries/tools from leaking in, new naming conventions and options. And remove dead code dealing with the nothreaded variant. Signed-off-by: Gustavo Zacarias <gustavozacarias@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-10-21 00:40:55 +02:00
platform_deps += win32/libgiowin32.la
endif
-SUBDIRS += . tests
+SUBDIRS += .
if HAVE_FAM
SUBDIRS += fam
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>
2017-06-21 23:01:03 +02:00
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
libglib2: disable tests and update configure options Sometimes if host-python is around it doesn't work too well with the distro python (Gentoo, FC20 at least) leading to build failures. This failure is very hard to trigger, it's normally easier to do so by enabling top-level parallel builds. Fixes: http://autobuild.buildroot.net/results/0f8/0f881e322b7f9d244b8dd2440ba0afd3a8418027/ While at it update the configure options to avoid any host libraries/tools from leaking in, new naming conventions and options. And remove dead code dealing with the nothreaded variant. Signed-off-by: Gustavo Zacarias <gustavozacarias@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-10-21 00:40:55 +02:00
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) \
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>
2017-06-21 23:01:03 +02:00
--
2.9.4
Reference in New Issue Copy Permalink