Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -1,4 +1,7 @@
|
||||
[PATCH] Fix compilation issues on architectures with limited atomic support
|
||||
From d5c628a6179b99705fa05ab87437321b132c81bc Mon Sep 17 00:00:00 2001
|
||||
From: Brendan Heading <brendanheading@gmail.com>
|
||||
Date: Wed, 21 Jun 2017 16:36:15 -0400
|
||||
Subject: [PATCH] Fix compile time atomic detection
|
||||
|
||||
Improved compile-time detection of atomic support in the compiler.
|
||||
|
||||
@@ -6,15 +9,16 @@ Upstream-Status: submitted
|
||||
See : https://bugzilla.gnome.org/show_bug.cgi?id=752731
|
||||
|
||||
Signed-off-by: Brendan Heading <brendanheading@gmail.com>
|
||||
Signed-off-by: Adam Duskett <aduskett@codeblue.com>
|
||||
---
|
||||
glib/gthread-posix.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
|
||||
index ae5d805..8db8557 100644
|
||||
index 71a6b7b..d09d029 100644
|
||||
--- a/glib/gthread-posix.c
|
||||
+++ b/glib/gthread-posix.c
|
||||
@@ -67,7 +67,7 @@
|
||||
@@ -65,7 +65,7 @@
|
||||
#endif
|
||||
|
||||
/* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */
|
||||
@@ -24,5 +28,5 @@ index ae5d805..8db8557 100644
|
||||
#endif
|
||||
|
||||
--
|
||||
2.4.3
|
||||
2.9.4
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From ee32416dec8462ee27c3c254100cf980b0889ce0 Mon Sep 17 00:00:00 2001
|
||||
From: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
|
||||
Date: Tue, 18 Oct 2016 23:04:50 +0530
|
||||
Subject: [PATCH] gio-2.0.pc: include libmount in Libs.private
|
||||
|
||||
This helps with static linking. When application statically links with
|
||||
libgio, it needs to link against libmount explicitly. When it is
|
||||
mentioned in Libs.private, build system can figure out with which extra
|
||||
libs to link against with help of pkg-config.
|
||||
|
||||
This build failure is detected by Buildroot autobuilder:
|
||||
http://autobuild.buildroot.net/results/fdf/fdf26abbed0014606a7788ce5d60828a0e871186
|
||||
|
||||
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
|
||||
---
|
||||
gio-2.0.pc.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
|
||||
index 899af0c..7574eb7 100644
|
||||
--- a/gio-2.0.pc.in
|
||||
+++ b/gio-2.0.pc.in
|
||||
@@ -14,5 +14,5 @@ Version: @VERSION@
|
||||
Requires: glib-2.0 gobject-2.0
|
||||
Requires.private: gmodule-no-export-2.0
|
||||
Libs: -L${libdir} -lgio-2.0
|
||||
-Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@
|
||||
+Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @LIBMOUNT_LIBS@
|
||||
Cflags:
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
From b9160d951b9af647b97766c57295ca4f45cf9521 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 3 Oct 2017 10:45:55 +0300
|
||||
Subject: [PATCH] Do not hardcode python path into various tools
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Fetch from: http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch?id=eef7883587acc933d6f34b559ec03ff84d18573b
|
||||
Signed-off-by: David Owens <david.owens@rockwellcollins.com>
|
||||
---
|
||||
gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +-
|
||||
gobject/glib-genmarshal.in | 2 +-
|
||||
gobject/glib-mkenums.in | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
|
||||
index 8050981..e693ef3 100644
|
||||
--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
|
||||
+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env @PYTHON@
|
||||
+#!/usr/bin/env python
|
||||
|
||||
# GDBus - GLib D-Bus Library
|
||||
#
|
||||
diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in
|
||||
index 09e8408..b2f9d99 100755
|
||||
--- a/gobject/glib-genmarshal.in
|
||||
+++ b/gobject/glib-genmarshal.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env @PYTHON@
|
||||
+#!/usr/bin/env python
|
||||
|
||||
# pylint: disable=too-many-lines, missing-docstring, invalid-name
|
||||
|
||||
diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
|
||||
index d4bfd11..051fce4 100755
|
||||
--- a/gobject/glib-mkenums.in
|
||||
+++ b/gobject/glib-mkenums.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env @PYTHON@
|
||||
+#!/usr/bin/env python
|
||||
|
||||
# If the code below looks horrible and unpythonic, do not panic.
|
||||
#
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
config BR2_PACKAGE_LIBGLIB2
|
||||
bool "libglib2"
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
|
||||
depends on BR2_USE_WCHAR # gettext
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
select BR2_PACKAGE_LIBFFI
|
||||
select BR2_PACKAGE_PCRE
|
||||
@@ -8,9 +10,6 @@ config BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
|
||||
select BR2_PACKAGE_ZLIB
|
||||
depends on BR2_USE_WCHAR # gettext
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
Low-level core library that forms the basis of GTK+ and GNOME.
|
||||
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# https://download.gnome.org/sources/glib/2.50/glib-2.50.2.sha256sum
|
||||
sha256 be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5 glib-2.50.2.tar.xz
|
||||
# https://download.gnome.org/sources/glib/2.54/glib-2.54.2.sha256sum
|
||||
sha256 bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c glib-2.54.2.tar.xz
|
||||
# License files, locally calculated
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBGLIB2_VERSION_MAJOR = 2.50
|
||||
LIBGLIB2_VERSION_MAJOR = 2.54
|
||||
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2
|
||||
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
|
||||
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
|
||||
LIBGLIB2_LICENSE = LGPLv2+
|
||||
LIBGLIB2_LICENSE = LGPL-2.1+
|
||||
LIBGLIB2_LICENSE_FILES = COPYING
|
||||
# 0002-disable-tests.patch
|
||||
LIBGLIB2_AUTORECONF = YES
|
||||
@@ -42,8 +42,6 @@ LIBGLIB2_CONF_ENV = \
|
||||
jm_cv_func_nanosleep_works=yes \
|
||||
gl_cv_func_working_utimes=yes \
|
||||
ac_cv_func_utime_null=yes \
|
||||
ac_cv_have_decl_strerror_r=yes \
|
||||
ac_cv_func_strerror_r_char_p=no \
|
||||
jm_cv_func_svid_putenv=yes \
|
||||
ac_cv_func_getcwd_null=yes \
|
||||
ac_cv_func_getdelim=yes \
|
||||
@@ -67,7 +65,7 @@ LIBGLIB2_CONF_ENV = \
|
||||
jm_cv_func_working_re_compile_pattern=yes \
|
||||
ac_use_included_regex=no \
|
||||
gl_cv_c_restrict=no \
|
||||
ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal \
|
||||
ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/bin/glib-genmarshal \
|
||||
ac_cv_prog_F77=no \
|
||||
ac_cv_func_posix_getgrgid_r=no \
|
||||
glib_cv_long_long_format=ll \
|
||||
@@ -103,8 +101,8 @@ HOST_LIBGLIB2_CONF_OPTS = \
|
||||
--with-pcre=system
|
||||
|
||||
LIBGLIB2_DEPENDENCIES = \
|
||||
host-pkgconf host-libglib2 host-gettext \
|
||||
libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
|
||||
host-pkgconf host-libglib2 \
|
||||
libffi pcre util-linux zlib $(TARGET_NLS_DEPENDENCIES)
|
||||
|
||||
HOST_LIBGLIB2_DEPENDENCIES = \
|
||||
host-gettext \
|
||||
@@ -163,7 +161,7 @@ endef
|
||||
# them as well, and better do it in a central place.
|
||||
# It's used at run time so it doesn't matter defering it.
|
||||
define LIBGLIB2_COMPILE_SCHEMAS
|
||||
$(HOST_DIR)/usr/bin/glib-compile-schemas \
|
||||
$(HOST_DIR)/bin/glib-compile-schemas \
|
||||
$(STAGING_DIR)/usr/share/glib-2.0/schemas \
|
||||
--targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas
|
||||
endef
|
||||
@@ -174,4 +172,4 @@ LIBGLIB2_TARGET_FINALIZE_HOOKS += LIBGLIB2_COMPILE_SCHEMAS
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
LIBGLIB2_HOST_BINARY = $(HOST_DIR)/usr/bin/glib-genmarshal
|
||||
LIBGLIB2_HOST_BINARY = $(HOST_DIR)/bin/glib-genmarshal
|
||||
|
||||
Reference in New Issue
Block a user