diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-03 18:25:45 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-05 13:19:54 +0100 |
commit | e2e161170ed55048905f0e465dfb9278e356a2a0 (patch) | |
tree | 3563b298e54cf40e798d7cfc254ecb001e2b7789 /meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch | |
parent | 631b2221170bc8ec24e679969065f20e065655cd (diff) | |
download | poky-e2e161170ed55048905f0e465dfb9278e356a2a0.tar.gz |
glib-2.0: update 2.62.4 -> 2.64.2
Add a couple of missing ptest dependencies.
Drop backports.
(From OE-Core rev: 8c2d45680ad0d8b2ab5bc7f78579fc82b04e6134)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 a3d71f2b7a..597864d9ac 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 @@ | |||
1 | From d29dfba67b1808eea6d428085f95b6e42cf2d1e4 Mon Sep 17 00:00:00 2001 | 1 | From 0015db45cd1bfefc04959dffab5dabeead93136f Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Tue, 22 Mar 2016 15:14:58 +0200 | 3 | Date: Tue, 22 Mar 2016 15:14:58 +0200 |
4 | Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM | 4 | Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM |
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [OE specific] | |||
14 | 1 file changed, 1 insertion(+) | 14 | 1 file changed, 1 insertion(+) |
15 | 15 | ||
16 | diff --git a/gio/meson.build b/gio/meson.build | 16 | diff --git a/gio/meson.build b/gio/meson.build |
17 | index 4e5e021..90a741a 100644 | 17 | index 2ef60ed..532b086 100644 |
18 | --- a/gio/meson.build | 18 | --- a/gio/meson.build |
19 | +++ b/gio/meson.build | 19 | +++ b/gio/meson.build |
20 | @@ -940,6 +940,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu | 20 | @@ -936,6 +936,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu |
21 | c_args : gio_c_args, | 21 | c_args : gio_c_args, |
22 | # intl.lib is not compatible with SAFESEH | 22 | # intl.lib is not compatible with SAFESEH |
23 | link_args : noseh_link_args, | 23 | link_args : noseh_link_args, |