From: Alexander Kanavin <a...@linutronix.de>
This as well has been solved via
https://git.yoctoproject.org/poky/commit/?id=f6a35934540e910794b8729ecc278189a39b710f
Signed-off-by: Alexander Kanavin <a...@linutronix.de>
---
...-correctly-when-building-with-mingw3.patch | 80 -------------------
meta/recipes-core/glib-2.0/glib.inc | 1 -
2 files changed, 81 deletions(-)
delete mode 100644
meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
diff --git
a/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
b/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
deleted file mode 100644
index a2f9dd9672f..00000000000
---
a/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 01810df82fae752428d3756c85edb2eb7bbf3c15 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kana...@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.kana...@gmail.com>
----
- gio/tests/meson.build | 8 ++++----
- glib/tests/meson.build | 2 +-
- meson.build | 3 +++
- 3 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 232ecca..563298b 100644
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -29,7 +29,7 @@ endif
-
- test_cpp_args = test_c_args
-
--if host_machine.system() == 'windows'
-+if host_system == 'windows'
- common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library
('secur32')]
- endif
-
-@@ -244,7 +244,7 @@ if have_dbus_daemon
- endif
-
- # Test programs buildable on UNIX only
--if host_machine.system() != 'windows'
-+if host_system != 'windows'
- gio_tests += {
- 'file' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3148
-@@ -593,7 +593,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
-
-@@ -663,7 +663,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
- }
- 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 f6efc59..83eb5a5 100644
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -226,7 +226,7 @@ if glib_conf.has('HAVE_EVENTFD')
- }
- endif
-
--if host_machine.system() == 'windows'
-+if host_system == 'windows'
- if winsock2.found()
- glib_tests += {
- 'gpoll' : {
-diff --git a/meson.build b/meson.build
-index 7534542..2560686 100644
---- a/meson.build
-+++ b/meson.build
-@@ -54,6 +54,9 @@ else
- endif
-
- host_system = host_machine.system()
-+if host_system == 'mingw32'
-+ host_system = 'windows'
-+endif
-
- if host_system == 'darwin'
- ios_test_code = '''#include <TargetConditionals.h>
diff --git a/meta/recipes-core/glib-2.0/glib.inc
b/meta/recipes-core/glib-2.0/glib.inc
index 1a97a0d02a6..2de50dd9af3 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -222,7 +222,6 @@ SRC_URI =
"${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
file://0010-Do-not-hardcode-python-path-into-various-tools.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-Run-atomics-test-on-clang-as-well.patch \
file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199469):
https://lists.openembedded.org/g/openembedded-core/message/199469
Mute This Topic: https://lists.openembedded.org/mt/106132516/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
