[OE-core] [PATCH] glib-2.0: convert from autotools to meson
PRINTF settings no longer seem necessary (tested with mingw).
Add meson-specific bits to Enable-more-tests-while-cross-compiling.patch and
0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
Add 0001-Set-host_machine-correctly-when-building-with-mingw3.patch
to allow 'mingw32' as target machine in addition to 'windows'.
Add 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch to
correct ARM build errors.
Drop configure-libtool.patch and uclibc_musl_translation.patch
(both autotools-specific).
Signed-off-by: Alexander Kanavin
---
...t-write-bindir-into-pkg-config-files.patch | 50 ++
...-gio-querymodules-as-libexec_PROGRAM.patch | 17 +++-
...-correctly-when-building-with-mingw3.patch | 81 +
...ot-hardcode-linux-as-the-host-system.patch | 27 ++
...ble-more-tests-while-cross-compiling.patch | 91 ++-
.../glib-2.0/glib-2.0/configure-libtool.patch | 44 -
.../glib-2.0/glib-2.0/relocate-modules.patch | 2 +-
.../glib-2.0/uclibc_musl_translation.patch| 22 -
meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb | 5 +-
meta/recipes-core/glib-2.0/glib.inc | 35 ---
10 files changed, 286 insertions(+), 88 deletions(-)
create mode 100644
meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
create mode 100644
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
create mode 100644
meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
delete mode 100644
meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
new file mode 100644
index 000..ede29c90bab
--- /dev/null
+++
b/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
+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
+---
+ 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/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
index 97d0aff5d6c..f246254942e 100644
---
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
+++
b/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
[OE-core] [PATCH] glib-2.0: convert from autotools to meson
PRINTF settings no longer seem necessary (tested with mingw).
Add meson-specific bits to Enable-more-tests-while-cross-compiling.patch and
0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
Add 0001-Set-host_machine-correctly-when-building-with-mingw3.patch
to allow 'mingw32' as target machine in addition to 'windows'.
Drop configure-libtool.patch and uclibc_musl_translation.patch
(both autotools-specific).
Signed-off-by: Alexander Kanavin
---
...t-write-bindir-into-pkg-config-files.patch | 50 ++
...-gio-querymodules-as-libexec_PROGRAM.patch | 17 +++-
...-correctly-when-building-with-mingw3.patch | 81 +
...ble-more-tests-while-cross-compiling.patch | 91 ++-
.../glib-2.0/glib-2.0/configure-libtool.patch | 44 -
.../glib-2.0/glib-2.0/relocate-modules.patch | 2 +-
.../glib-2.0/uclibc_musl_translation.patch| 22 -
meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb | 4 +-
meta/recipes-core/glib-2.0/glib.inc | 35 ---
9 files changed, 258 insertions(+), 88 deletions(-)
create mode 100644
meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
create mode 100644
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
delete mode 100644
meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
new file mode 100644
index 000..ede29c90bab
--- /dev/null
+++
b/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
+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
+---
+ 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/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
index 97d0aff5d6c..f246254942e 100644
---
a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
+++
b/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 17fc9230fb932432d8fbf8c56fdc4845495e Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen
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]
---
