diff options
Diffstat (limited to 'poky/meta/recipes-core/glib-2.0')
15 files changed, 451 insertions, 116 deletions
diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch new file mode 100644 index 000000000..ede29c90b --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch @@ -0,0 +1,50 @@ +From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 15 Feb 2019 11:17:27 +0100 +Subject: [PATCH] Do not write $bindir into pkg-config files + +This would otherwise break when using the files to build other target +components (we need to rely on PATH containing the paths to utilities, +rather than use target paths). + +Upstream-Status: Inappropriate [upstream wants the paths in .pc files] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + gio/meson.build | 6 +++--- + glib/meson.build | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/gio/meson.build b/gio/meson.build +index 85d8b14..657720a 100644 +--- a/gio/meson.build ++++ b/gio/meson.build +@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio, + 'schemasdir=' + join_paths('${datadir}', schemas_subdir), + 'bindir=' + join_paths('${prefix}', get_option('bindir')), + 'giomoduledir=' + giomodulesdir, +- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), +- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), +- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')], ++ 'glib_compile_schemas=glib-compile-schemas', ++ 'glib_compile_resources=glib-compile-resources', ++ 'gdbus_codegen=gdbus-codegen'], + version : glib_version, + install_dir : glib_pkgconfigreldir, + filebase : 'gio-2.0', +diff --git a/glib/meson.build b/glib/meson.build +index c05c694..434e8b1 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl], + subdirs : ['glib-2.0'], + extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, + variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), +- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), +- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], ++ 'glib_genmarshal=glib-genmarshal', ++ 'gobject_query=gobject-query', ++ 'glib_mkenums=glib-mkenums'], + version : glib_version, + install_dir : glib_pkgconfigreldir, + filebase : 'glib-2.0', diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index 97d0aff5d..f24625494 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch @@ -1,4 +1,4 @@ -From 856045927b9ab391165c0ebabf401835f8439eab Mon Sep 17 00:00:00 2001 +From 17fc9230fb932432d8faaaabf8c56fdc4845495e Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 22 Mar 2016 15:14:58 +0200 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM @@ -11,7 +11,8 @@ Upstream-Status: Inappropriate [OE specific] --- gio/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + gio/meson.build | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gio/Makefile.am b/gio/Makefile.am index e14cad2..bf2bcc7 100644 @@ -27,3 +28,15 @@ index e14cad2..bf2bcc7 100644 glib_compile_resources_LDADD = libgio-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la \ +diff --git a/gio/meson.build b/gio/meson.build +index b83d8f5..85d8b14 100644 +--- a/gio/meson.build ++++ b/gio/meson.build +@@ -925,6 +925,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu + c_args : gio_c_args, + # intl.lib is not compatible with SAFESEH + link_args : noseh_link_args, ++ install_dir: glib_libexecdir, + dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) + + glib_compile_schemas = executable('glib-compile-schemas', diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-absolute-paths-in-pkg-config-files.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-absolute-paths-in-pkg-config-files.patch new file mode 100644 index 000000000..f0c5d84ba --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-absolute-paths-in-pkg-config-files.patch @@ -0,0 +1,64 @@ +From abc26aed7a28678dfcc20b21726a97c7c02ea73b Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Thu, 14 Feb 2019 14:55:15 +0800 +Subject: [PATCH] Revert "Use absolute paths in pkg-config files" + +This reverts commit e7a7c9b97776fa2a638d18ea3a931ba84e778f80. + +The glib pkgconfig files now contain absolute paths, but they're +target paths so when we used them from a sysroot it fails. Upstream +thinks that we should be setting +GLIB_MKENUMS=/path/to/sysroot/usr/bin/glib-mkenums but that really +doesn't scale. + +For now, we just revert the change to put absolute paths into +the sysroot. This should be re-evaluated when we move the recipe to use +meson. + +Upstream-Status: Inappropriate [Revert of an upstream commit] +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + gio-2.0.pc.in | 7 +++---- + glib-2.0.pc.in | 7 +++---- + 2 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in +index d67e80839..526f0daa0 100644 +--- a/gio-2.0.pc.in ++++ b/gio-2.0.pc.in +@@ -5,11 +5,10 @@ includedir=@includedir@ + + datadir=@datadir@ + schemasdir=${datadir}/glib-2.0/schemas +-bindir=@bindir@ + giomoduledir=@GIO_MODULE_DIR@ +-glib_compile_schemas=${bindir}/glib-compile-schemas +-glib_compile_resources=${bindir}/glib-compile-resources +-gdbus_codegen=${bindir}/gdbus-codegen ++glib_compile_schemas=glib-compile-schemas ++glib_compile_resources=glib-compile-resources ++gdbus_codegen=gdbus-codegen + + Name: GIO + Description: glib I/O library +diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in +index 3c5ea81dc..275fc0163 100644 +--- a/glib-2.0.pc.in ++++ b/glib-2.0.pc.in +@@ -3,10 +3,9 @@ exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ + +-bindir=@bindir@ +-glib_genmarshal=${bindir}/glib-genmarshal +-gobject_query=${bindir}/gobject-query +-glib_mkenums=${bindir}/glib-mkenums ++glib_genmarshal=glib-genmarshal ++gobject_query=gobject-query ++glib_mkenums=glib-mkenums + + Name: GLib + Description: C Utility Library +-- +2.17.1 + diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch new file mode 100644 index 000000000..2b7fab7bd --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch @@ -0,0 +1,104 @@ +From 4169f11beedacfbb8c7934a4c99189d44935a6b9 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 13 Feb 2019 15:32:05 +0100 +Subject: [PATCH] Set host_machine correctly when building with mingw32 + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + gio/tests/meson.build | 8 ++++---- + glib/tests/meson.build | 4 ++-- + meson.build | 3 +++ + tests/meson.build | 2 +- + 4 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/gio/tests/meson.build b/gio/tests/meson.build +index 181f5c7..11a1f12 100644 +--- a/gio/tests/meson.build ++++ b/gio/tests/meson.build +@@ -12,7 +12,7 @@ test_c_args = [ + '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()), + ] + +-if host_machine.system() == 'windows' ++if host_system == 'windows' + common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] + endif + +@@ -122,7 +122,7 @@ if dbus1_dep.found() + endif + + # Test programs buildable on UNIX only +-if host_machine.system() != 'windows' ++if host_system != 'windows' + gio_tests += [{ + 'file' : {}, + 'gdbus-peer' : { +@@ -314,7 +314,7 @@ if host_machine.system() != 'windows' + endif # unix + + # Test programs buildable on Windows only +-if host_machine.system() == 'windows' ++if host_system == 'windows' + gio_tests += [{'win32-streams' : {}}] + endif + +@@ -379,7 +379,7 @@ if cc.get_id() != 'msvc' + }] + endif + +-if host_machine.system() != 'windows' ++if host_system != 'windows' + test_extra_programs += [{ + 'gdbus-example-unix-fd-client' : { + 'install' : false, +diff --git a/glib/tests/meson.build b/glib/tests/meson.build +index d7b6a7a..6678a08 100644 +--- a/glib/tests/meson.build ++++ b/glib/tests/meson.build +@@ -45,7 +45,7 @@ glib_tests = { + 'hook' : {}, + 'hostutils' : {}, + 'include' : { +- 'skip' : host_machine.system() == 'windows', ++ 'skip' : host_system == 'windows', + }, + 'keyfile' : {}, + 'list' : {}, +@@ -112,7 +112,7 @@ glib_tests = { + 'utils' : {}, + 'unicode' : {}, + 'unix' : { +- 'skip' : host_machine.system() == 'windows', ++ 'skip' : host_system == 'windows', + }, + 'uri' : {}, + '1bit-mutex' : {}, +diff --git a/meson.build b/meson.build +index f7405a2..4348f20 100644 +--- a/meson.build ++++ b/meson.build +@@ -31,6 +31,9 @@ else + endif + + host_system = host_machine.system() ++if host_system == 'mingw32' ++ host_system = 'windows' ++endif + + glib_version = meson.project_version() + glib_api_version = '2.0' +diff --git a/tests/meson.build b/tests/meson.build +index 80e45d7..9f3869f 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -67,7 +67,7 @@ test_extra_programs = { + 'unicode-collate' : {}, + } + +-if host_machine.system() != 'windows' ++if host_system != 'windows' + tests += [{ + 'timeloop' : {}, + 'spawn-test' : {}, diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch new file mode 100644 index 000000000..d1ed02875 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch @@ -0,0 +1,62 @@ +Upstream-Status: Backport [fc88e56bfc2b09a8fb2b350e76f6425ab0a056d7] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 141acf6a2f3b21d63c9cfe620b8e20a506e78493 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Wed, 13 Mar 2019 16:22:09 +0000 +Subject: [PATCH] meson: do a build-time check for strlcpy before attempting + runtime check + +In cross-compilation environments the runtime check isn't possible so it is up +to the builder to seed the cross file, but we can definitely state that strlcpy +doesn't exist with a build test. +--- + meson.build | 30 ++++++++++++++++-------------- + 1 file changed, 16 insertions(+), 14 deletions(-) + +diff --git a/meson.build b/meson.build +index 15039e448..414f2d9b1 100644 +--- a/meson.build ++++ b/meson.build +@@ -1860,22 +1860,24 @@ endif + + # Test if we have strlcpy/strlcat with a compatible implementation: + # https://bugzilla.gnome.org/show_bug.cgi?id=53933 +-if cc_can_run +- rres = cc.run('''#include <stdlib.h> +- #include <string.h> +- int main() { +- char p[10]; +- (void) strlcpy (p, "hi", 10); +- if (strlcat (p, "bye", 0) != 3) +- return 1; +- return 0; +- }''', +- name : 'OpenBSD strlcpy/strlcat') +- if rres.compiled() and rres.returncode() == 0 ++if cc.has_function('strlcpy') ++ if cc_can_run ++ rres = cc.run('''#include <stdlib.h> ++ #include <string.h> ++ int main() { ++ char p[10]; ++ (void) strlcpy (p, "hi", 10); ++ if (strlcat (p, "bye", 0) != 3) ++ return 1; ++ return 0; ++ }''', ++ name : 'OpenBSD strlcpy/strlcat') ++ if rres.compiled() and rres.returncode() == 0 ++ glib_conf.set('HAVE_STRLCPY', 1) ++ endif ++ elif meson.get_cross_property('have_strlcpy', false) + glib_conf.set('HAVE_STRLCPY', 1) + endif +-elif meson.get_cross_property('have_strlcpy', false) +- glib_conf.set('HAVE_STRLCPY', 1) + endif + + python = import('python').find_installation('python3') +-- +2.11.0 + diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch new file mode 100644 index 000000000..5a1a58989 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch @@ -0,0 +1,27 @@ +From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 19 Feb 2019 10:31:11 +0100 +Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system + +OE build system can set this to other values that include 'linux', +e.g. 'linux-gnueabi' + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 4348f20..af5ed63 100644 +--- a/meson.build ++++ b/meson.build +@@ -1574,7 +1574,7 @@ atomicdefine = ''' + # We know that we can always use real ("lock free") atomic operations with MSVC + if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops') + have_atomic_lock_free = true +- if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define') ++ if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define') + # When building for armv5 on Linux, gcc provides + # __sync_bool_compare_and_swap but doesn't define + # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch index 697d63d5f..872340df9 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch @@ -12,7 +12,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 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 +index 8050981..e693ef3 100755 --- a/gio/gdbus-2.0/codegen/gdbus-codegen.in +++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in @@ -1,4 +1,4 @@ diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch index 50781e789..5ccd3203f 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch @@ -1,4 +1,4 @@ -From 4b1a6d247c78125096a6ea5ab3cab8a1f000dc23 Mon Sep 17 00:00:00 2001 +From 1481c6d5f08f9dbbe10abc87b372a1f61db36476 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Mon, 9 Nov 2015 11:07:27 +0200 Subject: [PATCH] Enable more tests while cross-compiling @@ -9,17 +9,17 @@ case we can depend on glib-2.0-native. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> - --- gio/tests/Makefile.am | 10 ++++++---- - tests/gobject/Makefile.am | 8 +++++--- - 2 files changed, 11 insertions(+), 7 deletions(-) + gio/tests/meson.build | 15 ++++++++------- + tests/gobject/Makefile.am | 6 ++++++ + 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index 1f0bed7..8295deb 100644 +index c4e7a92..633e85c 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am -@@ -550,10 +550,9 @@ test_programs += \ +@@ -583,10 +583,9 @@ test_programs += \ endif # ----------------------------------------------------------------------------- @@ -32,7 +32,7 @@ index 1f0bed7..8295deb 100644 test_programs += resources resources_SOURCES = resources.c nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h -@@ -578,7 +577,11 @@ if !ENABLE_INSTALLED_TESTS +@@ -611,7 +610,11 @@ if !ENABLE_INSTALLED_TESTS libresourceplugin_la_LDFLAGS += -rpath / endif @@ -44,7 +44,7 @@ index 1f0bed7..8295deb 100644 test-generated.txt: test1.txt $(AM_V_GEN) echo "Generated" > $@ && \ -@@ -599,7 +602,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- +@@ -632,7 +635,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource @@ -52,19 +52,82 @@ index 1f0bed7..8295deb 100644 BUILT_SOURCES += giotypefuncs.inc +diff --git a/gio/tests/meson.build b/gio/tests/meson.build +index dca33bd..181f5c7 100644 +--- a/gio/tests/meson.build ++++ b/gio/tests/meson.build +@@ -173,7 +173,7 @@ if host_machine.system() != 'windows' + + # Test programs that need to bring up a session bus (requires dbus-daemon) + have_dbus_daemon = find_program('dbus-daemon', required : false).found() +- if have_dbus_daemon ++ if true + annotate_args = [ + '--annotate', 'org.project.Bar', 'Key1', 'Value1', + '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', +@@ -406,12 +406,13 @@ if installed_tests_enabled + install_subdir('cert-tests', install_dir : installed_tests_execdir) + endif + +-if not meson.is_cross_build() or meson.has_exe_wrapper() ++#if not meson.is_cross_build() or meson.has_exe_wrapper() ++if meson.is_cross_build() + + plugin_resources_c = custom_target('plugin-resources.c', + input : 'test4.gresource.xml', + output : 'plugin-resources.c', +- command : [glib_compile_resources, ++ command : ['glib-compile-resources', + '--target=@OUTPUT@', + '--sourcedir=' + meson.current_source_dir(), + '--generate-source', +@@ -428,7 +429,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() + test_gresource = custom_target('test.gresource', + input : 'test.gresource.xml', + output : 'test.gresource', +- command : [glib_compile_resources, ++ command : ['glib-compile-resources', + '--target=@OUTPUT@', + '--sourcedir=' + meson.current_source_dir(), + '--sourcedir=' + meson.current_build_dir(), +@@ -439,7 +440,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() + test_resources2_c = custom_target('test_resources2.c', + input : 'test3.gresource.xml', + output : 'test_resources2.c', +- command : [glib_compile_resources, ++ command : ['glib-compile-resources', + '--target=@OUTPUT@', + '--sourcedir=' + meson.current_source_dir(), + '--generate', +@@ -450,7 +451,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() + test_resources2_h = custom_target('test_resources2.h', + input : 'test3.gresource.xml', + output : 'test_resources2.h', +- command : [glib_compile_resources, ++ command : ['glib-compile-resources', + '--target=@OUTPUT@', + '--sourcedir=' + meson.current_source_dir(), + '--generate', +@@ -461,7 +462,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() + test_resources_c = custom_target('test_resources.c', + input : 'test2.gresource.xml', + output : 'test_resources.c', +- command : [glib_compile_resources, ++ command : ['glib-compile-resources', + '--target=@OUTPUT@', + '--sourcedir=' + meson.current_source_dir(), + '--generate-source', diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am -index 0e60987..927d13a 100644 +index 1bcefbe..77e646a 100644 --- a/tests/gobject/Makefile.am +++ b/tests/gobject/Makefile.am -@@ -51,10 +51,13 @@ if ENABLE_TIMELOOP +@@ -51,7 +51,13 @@ if ENABLE_TIMELOOP installed_test_programs += timeloop-closure endif --# The marshal test requires running a binary, which means we cannot --# build it when cross-compiling +# The marshal test requires running a binary, which means we require +# glib-native when cross-compiling - if !CROSS_COMPILING ++if !CROSS_COMPILING glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal +else +glib_genmarshal=$(shell which glib-genmarshal) @@ -72,9 +135,3 @@ index 0e60987..927d13a 100644 testmarshal.h: stamp-testmarshal.h @true -@@ -71,4 +74,3 @@ testmarshal.c: testmarshal.h testmarshal.list $(glib_genmarshal) - BUILT_SOURCES += testmarshal.h testmarshal.c - CLEANFILES += stamp-testmarshal.h testmarshal.h testmarshal.c - EXTRA_DIST += testcommon.h testmarshal.list --endif # !CROSS_COMPILING -\ No newline at end of file diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch deleted file mode 100644 index 59b891347..000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1dd1e6ddca5deada049bac2e1ee1fe4ecc5342c5 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sat, 28 Apr 2012 18:24:50 +0200 -Subject: [PATCH 01/10] configure: use $host_alias-libtool instead of libtool - directly - -Poky renames libtool to $host_alias-libtool. -./$host_alias-libtool isn't created until after configure runs with -libtool >= 2.2.2 -so we can't call # it at this point. We can safely assume a version is -available -from PATH though - -Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com> -Rebased to glib-2.32.1 by Martin Jansa <Martin.Jansa@gmail.com> -Rebased to glib-2.31.20+ by Andre McCurdy <armccurdy@gmail.com> - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6fa6eb0..b6f78a6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1428,9 +1428,9 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [ - LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" - dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness - echo "void glib_plugin_test(void) { }" > plugin.c -- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ -+ ${SHELL} ./$host_alias-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ - ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1 -- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ -+ ${SHELL} ./$host_alias-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ - ${LDFLAGS} -module -o plugin.la -export-dynamic \ - -shrext ".o" -avoid-version plugin.lo \ - -rpath /dont/care >/dev/null 2>&1 --- -2.14.1 - diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch deleted file mode 100644 index dd0aff728..000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch +++ /dev/null @@ -1,20 +0,0 @@ -Update Lithuanian month names in the test suite as glibc changed the translations. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/merge_requests/373] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/glib/tests/date.c b/glib/tests/date.c -index b801ca704..6646c227c 100644 ---- a/glib/tests/date.c -+++ b/glib/tests/date.c -@@ -365,8 +365,8 @@ test_month_names (void) - TEST_DATE ( 1, 4, 2018, "%Y m. %OB", "2018 m. balandis"); - TEST_DATE ( 1, 5, 2018, "%Y m. %OB", "2018 m. gegužė"); - TEST_DATE ( 1, 6, 2018, "%Y m. %OB", "2018 m. birželis"); -- TEST_DATE (17, 7, 2018, "%Y m. %b %e d.", "2018 m. Lie 17 d."); -- TEST_DATE ( 1, 8, 2018, "%Y m. %Ob", "2018 m. Rgp"); -+ TEST_DATE (17, 7, 2018, "%Y m. %b %e d.", "2018 m. Liep. 17 d."); -+ TEST_DATE ( 1, 8, 2018, "%Y m. %Ob", "2018 m. rugp."); - } - else - g_test_skip ("locale lt_LT not available, skipping Lithuanian month names test"); diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross b/poky/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross new file mode 100644 index 000000000..8420f9874 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross @@ -0,0 +1,6 @@ +[properties] +have_c99_vsnprintf = true +have_c99_snprintf = true +have_unix98_printf = true +va_val_copy = true +growing_stack = false diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index f9794d3dd..a4e0c9201 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From 8326961841f4d16c7239e747de11e3817c35cfd2 Mon Sep 17 00:00:00 2001 +From 9d985803c50cfb99253c757934985f937da34822 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest index 5b85e8fab..8f082d34f 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest @@ -1,5 +1,6 @@ #! /bin/sh +set -eux useradd glib2-test su glib2-test -c gnome-desktop-testing-runner glib userdel glib2-test diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb index 1271a7c26..733a2d46d 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb @@ -5,18 +5,22 @@ PE = "1" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ - file://configure-libtool.patch \ file://run-ptest \ file://uclibc_musl_translation.patch \ - file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ file://Enable-more-tests-while-cross-compiling.patch \ + file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ file://0001-Do-not-ignore-return-value-of-write.patch \ file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ - file://date-lt.patch \ + file://0001-Revert-Use-absolute-paths-in-pkg-config-files.patch \ + file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ + file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ + file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ + file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \ + file://glib-meson.cross \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[md5sum] = "9b5d21c802f55bf37171c4fbfe7d32d1" -SRC_URI[sha256sum] = "c0f4ce0730b4f95c47b711613b5406a887c2ee13ea6d25930d72a4fa7fdb77f6" +SRC_URI[md5sum] = "8058c7bde846dcffe5fa453eca366d73" +SRC_URI[sha256sum] = "8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481" diff --git a/poky/meta/recipes-core/glib-2.0/glib.inc b/poky/meta/recipes-core/glib-2.0/glib.inc index e8215da58..574bb3855 100644 --- a/poky/meta/recipes-core/glib-2.0/glib.inc +++ b/poky/meta/recipes-core/glib-2.0/glib.inc @@ -22,34 +22,38 @@ DEPENDS = "glib-2.0-native \ virtual/libintl \ virtual/libiconv \ libffi \ - zlib \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'dbus', '', d)}" + zlib" PACKAGES += "${PN}-codegen ${PN}-utils" LEAD_SONAME = "libglib-2.0.*" -inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages +inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages distro_features_check -S = "${WORKDIR}/glib-${PV}" +GTKDOC_ENABLE_FLAG = "-Dgtk_doc=true" +GTKDOC_DISABLE_FLAG = "-Dgtk_doc=false" -PACKAGECONFIG ??= "system-pcre libmount" -# To use the system pcre it must be configured with --enable-unicode-properties -PACKAGECONFIG[system-pcre] = "--with-pcre=system,--with-pcre=internal,libpcre" -PACKAGECONFIG[libmount] = "--enable-libmount,--disable-libmount,util-linux" -PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native" -PACKAGECONFIG[libelf] = "--enable-libelf,--disable-libelf,elfutils" +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ + '${GTKDOC_DISABLE_FLAG}', d)} " -CORECONF = "--disable-dtrace --disable-fam --disable-systemtap" +# This avoids the need to depend on target python3, which in case of mingw is not even possible. +# meson's python configuration pokes into python3 configuration, so this provides the native config to it. +unset _PYTHON_SYSCONFIGDATA_NAME -PRINTF = "--enable-included-printf=no" -PRINTF_darwin = "--enable-included-printf=yes" -PRINTF_mingw32 = "--enable-included-printf=yes" -EXTRA_OECONF = "${PRINTF} ${CORECONF}" -EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" +S = "${WORKDIR}/glib-${PV}" + +PACKAGECONFIG ??= "system-pcre libmount \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +# To use the system pcre it must be configured with --enable-unicode-properties +PACKAGECONFIG[system-pcre] = "-Dinternal_pcre=false,-Dinternal_pcre=true,libpcre" +PACKAGECONFIG[libmount] = "-Dlibmount=true,-Dlibmount=false,util-linux" +PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native" +# libelf is auto-detected without a configuration option +PACKAGECONFIG[libelf] = ",,elfutils" +PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus" -# Tell configure that we'll have dbus-daemon on the target for the tests -EXTRA_OECONF_append_class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}" +EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=false" +EXTRA_OEMESON_append_class-target = " --cross-file ${WORKDIR}/glib-meson.cross" do_configure_prepend() { sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in @@ -75,9 +79,12 @@ FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ ${bindir}/gdbus-codegen" FILES_${PN}-utils = "${bindir}/*" -RRECOMMENDS_${PN} += "shared-mime-info" +SHAREDMIMEDEP = "shared-mime-info" +SHAREDMIMEDEP_class-native = "" # When cross compiling for Windows we don't want to include this -RRECOMMENDS_${PN}_remove_mingw32 = "shared-mime-info" +SHAREDMIMEDEP_mingw32 = "" + +RRECOMMENDS_${PN} += "${SHAREDMIMEDEP}" ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" @@ -112,6 +119,8 @@ do_install_append () { if test "x${MLPREFIX}" != "x"; then mv ${D}${libexecdir}/gio-querymodules${EXEEXT} ${D}${libexecdir}/${MLPREFIX}gio-querymodules${EXEEXT} fi + # Autotools does this, meson does not + mkdir -p ${D}${libdir}/gio/modules } do_install_append_class-target () { @@ -124,6 +133,11 @@ do_install_append_class-target () { fi } +# As we do not build python3 for windows, makes no sense to ship the script that's using it +do_install_append_mingw32() { + rm -f ${D}${bindir}/gtester-report +} + CODEGEN_PYTHON_RDEPENDS = "python3 python3-distutils python3-xml" CODEGEN_PYTHON_RDEPENDS_mingw32 = "" @@ -140,8 +154,6 @@ RDEPENDS_${PN}-ptest += "\ shared-mime-info \ " -# When https://gitlab.gnome.org/GNOME/glib/issues/1343 is -# fixed add locale-base-pl-pl RDEPENDS_${PN}-ptest_append_libc-glibc = "\ glibc-gconv-utf-16 \ glibc-charmap-utf-8 \ @@ -165,6 +177,5 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\ locale-base-fr-fr \ locale-base-es-es \ locale-base-en-gb \ + locale-base-pl-pl \ " - -INSANE_SKIP_${PN}-ptest += "libdir" |
