Signed-off-by: Brendan Heading <brendanheading@gmail.com>
Signed-off-by: Adam Duskett <aduskett@gmail.com>
+Refresh for 2.68.1
---
- glib/gthread-posix.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ glib/gthread-posix.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
index 71a6b7b..d09d029 100644
--- a/glib/gthread-posix.c
+++ b/glib/gthread-posix.c
-@@ -73,7 +73,7 @@
+@@ -72,8 +72,7 @@
+ #include <sys/syscall.h>
#endif
- /* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */
--#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && !defined(__clang__)
+-#if defined(HAVE_FUTEX) && \
+- (defined(HAVE_STDATOMIC_H) || defined(__ATOMIC_SEQ_CST))
+#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && !defined(__clang__)
#define USE_NATIVE_MUTEX
#endif
+++ /dev/null
-From cdccbc6ec36243463613cb32d7058c26c3c51e16 Mon Sep 17 00:00:00 2001
-From: Adam Duskett <Aduskett@gmail.com>
-Date: Wed, 18 Sep 2019 09:50:00 -0700
-Subject: [PATCH] allow explicit disabling of tests
-
-Upstream won't build tests when cross-compiling. However; this means still
-building the tests during a host build. Building the tests causes build
-failures on older distributions such as CentOS 6 and Debian 7 because the
-command `objcopy --add-symbol` is used when building the test
-"test_resources2," which is not available with the older version of objcopy
-provided by the distributions.
-
-Instead, remove the conditional checks which set build_tests and only check if
-installed_tests_enabled is passed.
-
-Signed-off-by: Adam Duskett <Aduskett@gmail.com>
-Refresh for 2.62.2
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 99806d0..3206603 100644
---- a/meson.build
-+++ b/meson.build
-@@ -84,7 +84,7 @@ installed_tests_template = files('template.test.in')
- installed_tests_template_tap = files('template-tap.test.in')
-
- # Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use)
--build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) or installed_tests_enabled
-+build_tests = installed_tests_enabled
-
- add_project_arguments('-D_GNU_SOURCE', language: 'c')
-
---
-2.23.0
-
--- /dev/null
+From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Aduskett@gmail.com>
+Date: Mon, 16 Sep 2019 10:12:38 -0700
+Subject: [PATCH] remove cpp requirement
+
+The c++ test is necessary to ensure libglib doesn't accidentally use C++
+reserved keywords in public headers. Because this is just a test, it isn't
+necessary to have a C++ compiler to build libglib2.
+
+Signed-off-by: Adam Duskett <Aduskett@gmail.com>
+Upstream status: Denied (Buildroot specific)
+https://gitlab.gnome.org/GNOME/glib/issues/1748
+---
+ glib/glibconfig.h.in | 1 -
+ meson.build | 18 +-----------------
+ tests/meson.build | 5 -----
+ 3 files changed, 1 insertion(+), 23 deletions(-)
+
+diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in
+index 7ef8c48..128e65d 100644
+--- a/glib/glibconfig.h.in
++++ b/glib/glibconfig.h.in
+@@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr;
+ @glib_vacopy@
+
+ @g_have_iso_c_varargs@
+-@g_have_iso_cxx_varargs@
+
+ /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
+ * is passed ISO vararg support is turned off, and there is no work
+diff --git a/meson.build b/meson.build
+index 4bbf4c2..ac59f4e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,4 +1,4 @@
+-project('glib', 'c', 'cpp',
++project('glib', 'c',
+ version : '2.68.1',
+ # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships
+ meson_version : '>= 0.49.2',
+@@ -10,7 +10,6 @@ project('glib', 'c', 'cpp',
+ )
+
+ cc = meson.get_compiler('c')
+-cxx = meson.get_compiler('cpp')
+
+ cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper()
+
+@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs
+ #endif''')
+ endif
+
+-g_have_iso_cxx_varargs = cxx.compiles('''
+- void some_func (void) {
+- int a(int p1, int p2, int p3);
+- #define call_a(...) a(1,__VA_ARGS__)
+- call_a(2,3);
+- }''', name : 'ISO C99 varargs macros in C++')
+-
+-if g_have_iso_cxx_varargs
+- glibconfig_conf.set('g_have_iso_cxx_varargs', '''
+-#ifdef __cplusplus
+-# define G_HAVE_ISO_VARARGS 1
+-#endif''')
+-endif
+-
+ g_have_gnuc_varargs = cc.compiles('''
+ void some_func (void) {
+ int a(int p1, int p2, int p3);
+@@ -2330,7 +2315,6 @@ subdir('gobject')
+ subdir('gthread')
+ subdir('gmodule')
+ subdir('gio')
+-subdir('fuzzing')
+ if build_tests
+ subdir('tests')
+ endif
+diff --git a/tests/meson.build b/tests/meson.build
+index e4ea226..7fd974c 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -55,11 +55,6 @@ tests = {
+ 'source': 'module-test.c',
+ 'c_args': ['-DMODULE_TYPE="plugin"'],
+ },
+- 'cxx-test' : {
+- 'source' : 'cxx-test.cpp',
+- 'include_directories' : gmoduleinc,
+- 'dependencies' : [libgio_dep],
+- },
+ }
+
+ test_extra_programs = {
+--
+2.23.0
+
--- /dev/null
+From 9e0f11a4981737f98bac93a22b6f2ff1a3887b63 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Aduskett@gmail.com>
+Date: Tue, 9 Apr 2019 13:03:51 -0400
+Subject: [PATCH] Add '-Wno-format-nonliteral' to compiler arguments.
+
+This warning is a false positive on older versions of gcc.
+See https://gitlab.gnome.org/GNOME/glib/issues/1744 for more details.
+
+Signed-off-by: Adam Duskett <Aduskett@gmail.com>
+Refresh for 2.68.1
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index 3c615b7..7cae4e8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -431,6 +431,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
+ # building with -Wbad-function-cast.
+ '-Wno-bad-function-cast',
+ '-Wno-cast-function-type',
++ '-Wno-format-nonliteral',
+ # Due to function casts through (void*) we cannot support -Wpedantic:
+ # https://wiki.gnome.org/Projects/GLib/CompilerRequirements#Function_pointer_conversions.
+ '-Wno-pedantic',
+--
+2.20.1
+
+++ /dev/null
-From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001
-From: Adam Duskett <Aduskett@gmail.com>
-Date: Mon, 16 Sep 2019 10:12:38 -0700
-Subject: [PATCH] remove cpp requirement
-
-The c++ test is necessary to ensure libglib doesn't accidentally use C++
-reserved keywords in public headers. Because this is just a test, it isn't
-necessary to have a C++ compiler to build libglib2.
-
-Signed-off-by: Adam Duskett <Aduskett@gmail.com>
-Upstream status: Denied (Buildroot specific)
-https://gitlab.gnome.org/GNOME/glib/issues/1748
----
- glib/glibconfig.h.in | 1 -
- meson.build | 18 +-----------------
- tests/meson.build | 5 -----
- 3 files changed, 1 insertion(+), 23 deletions(-)
-
-diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in
-index 7ef8c48..128e65d 100644
---- a/glib/glibconfig.h.in
-+++ b/glib/glibconfig.h.in
-@@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr;
- @glib_vacopy@
-
- @g_have_iso_c_varargs@
--@g_have_iso_cxx_varargs@
-
- /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
- * is passed ISO vararg support is turned off, and there is no work
-diff --git a/meson.build b/meson.build
-index 4bbf4c2..ac59f4e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,4 +1,4 @@
--project('glib', 'c', 'cpp',
-+project('glib', 'c',
- version : '2.66.8',
- # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships
- meson_version : '>= 0.49.2',
-@@ -10,7 +10,6 @@ project('glib', 'c', 'cpp',
- )
-
- cc = meson.get_compiler('c')
--cxx = meson.get_compiler('cpp')
-
- cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper()
-
-@@ -1548,20 +1547,6 @@ if g_have_iso_c_varargs
- #endif''')
- endif
-
--g_have_iso_cxx_varargs = cxx.compiles('''
-- void some_func (void) {
-- int a(int p1, int p2, int p3);
-- #define call_a(...) a(1,__VA_ARGS__)
-- call_a(2,3);
-- }''', name : 'ISO C99 varargs macros in C++')
--
--if g_have_iso_cxx_varargs
-- glibconfig_conf.set('g_have_iso_cxx_varargs', '''
--#ifdef __cplusplus
--# define G_HAVE_ISO_VARARGS 1
--#endif''')
--endif
--
- g_have_gnuc_varargs = cc.compiles('''
- void some_func (void) {
- int a(int p1, int p2, int p3);
-@@ -2167,7 +2152,6 @@ subdir('gobject')
- subdir('gthread')
- subdir('gmodule')
- subdir('gio')
--subdir('fuzzing')
- if build_tests
- subdir('tests')
- endif
-diff --git a/tests/meson.build b/tests/meson.build
-index e4ea226..7fd974c 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -55,11 +55,6 @@ tests = {
- 'source': 'module-test.c',
- 'c_args': ['-DMODULE_TYPE="plugin"'],
- },
-- 'cxx-test' : {
-- 'source' : 'cxx-test.cpp',
-- 'include_directories' : gmoduleinc,
-- 'dependencies' : [libgio_dep],
-- },
- }
-
- test_extra_programs = {
---
-2.23.0
-
+++ /dev/null
-From 9e0f11a4981737f98bac93a22b6f2ff1a3887b63 Mon Sep 17 00:00:00 2001
-From: Adam Duskett <Aduskett@gmail.com>
-Date: Tue, 9 Apr 2019 13:03:51 -0400
-Subject: [PATCH] Add '-Wno-format-nonliteral' to compiler arguments.
-
-This warning is a false positive on older versions of gcc.
-See https://gitlab.gnome.org/GNOME/glib/issues/1744 for more details.
-
-Signed-off-by: Adam Duskett <Aduskett@gmail.com>
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/meson.build b/meson.build
-index 3c615b7..7cae4e8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -372,6 +372,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
- '-Wno-cast-function-type',
-+ '-Wno-format-nonliteral',
- # Due to function casts through (void*) we cannot support -Wpedantic:
- # https://wiki.gnome.org/Projects/GLib/CompilerRequirements#Function_pointer_conversions.
- '-Wno-pedantic',
- '-Werror=declaration-after-statement',
- '-Werror=format=2',
---
-2.20.1
-
-# https://download.gnome.org/sources/glib/2.66/glib-2.66.8.sha256sum
-sha256 97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b glib-2.66.8.tar.xz
+# https://download.gnome.org/sources/glib/2.68/glib-2.68.1.sha256sum
+sha256 241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333 glib-2.68.1.tar.xz
# License files, locally calculated
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
#
################################################################################
-LIBGLIB2_VERSION_MAJOR = 2.66
-LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).8
+LIBGLIB2_VERSION_MAJOR = 2.68
+LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
LIBGLIB2_LICENSE = LGPL-2.1+
HOST_LIBGLIB2_CONF_OPTS = \
-Ddtrace=false \
-Dfam=false \
+ -Dglib_debug=disabled \
+ -Dlibelf=disabled \
-Dselinux=disabled \
-Dsystemtap=false \
-Dxattr=false \
-Dinternal_pcre=false \
- -Dinstalled_tests=false \
+ -Dtests=false \
-Doss_fuzz=disabled
LIBGLIB2_DEPENDENCIES = \
# ${libdir} would be prefixed by the sysroot by pkg-config, causing a
# bogus installation path once combined with $(DESTDIR).
LIBGLIB2_CONF_OPTS = \
+ -Dglib_debug=disabled \
-Dinternal_pcre=false \
+ -Dlibelf=disabled \
-Dgio_module_dir=/usr/lib/gio/modules \
- -Dinstalled_tests=false \
+ -Dtests=false \
-Doss_fuzz=disabled
LIBGLIB2_MESON_EXTRA_PROPERTIES = \
projects / buildroot.git / commitdiff