diff options
author | Ross Burton <ross.burton@intel.com> | 2019-05-10 10:58:27 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-12 17:55:11 +0100 |
commit | c90507824c2d3e7db90c41ae5ba5a568ae95c2cd (patch) | |
tree | e7c6a866812cc39ce0ab4b5e14e98aef3ba0b9a3 /meta/recipes-core | |
parent | 00ff69a5bb4a815233072f5ad16b73581dced128 (diff) | |
download | poky-c90507824c2d3e7db90c41ae5ba5a568ae95c2cd.tar.gz |
glib-2.0: fix locale handling
A bug upstream resulted in broken locale handling with the new glibc we have, so
the test suite was failing.
(From OE-Core rev: 8331008bc5b8c97469301701e4bd899610989198)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch | 62 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb | 1 |
2 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch b/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch new file mode 100644 index 0000000000..5c1488bc41 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/merge_requests/828] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 93d8482384ebc5c7d1f3d92b0190db0371269663 Mon Sep 17 00:00:00 2001 | ||
5 | From: Rafal Luzynski <digitalfreak@lingonborough.com> | ||
6 | Date: Fri, 10 May 2019 00:40:27 +0200 | ||
7 | Subject: [PATCH] build: Fix a typo in the test whether _NL_ABALTMON_n is | ||
8 | supported | ||
9 | |||
10 | The correct spelling is "_NL_ABALTMON_n" rather than "_NL_ALTMON_n". | ||
11 | The typo made Meson build think that _NL_ABALTMON_n constants are | ||
12 | not supported which was totally wrong. This made g_date_time_format() | ||
13 | output incorrect abbreviated month names in some languages. | ||
14 | The old configure.ac script was correct here. | ||
15 | |||
16 | Bug introduced in commit be4f96b6502c01d2a51d60b7a669c8ef82e22a4d. | ||
17 | |||
18 | Closes: #1759 | ||
19 | --- | ||
20 | meson.build | 26 +++++++++++++------------- | ||
21 | 1 file changed, 13 insertions(+), 13 deletions(-) | ||
22 | |||
23 | diff --git a/meson.build b/meson.build | ||
24 | index c5d2ce5f8..08fa40ac5 100644 | ||
25 | --- a/meson.build | ||
26 | +++ b/meson.build | ||
27 | @@ -1002,20 +1002,20 @@ if cc.links('''#ifndef _GNU_SOURCE | ||
28 | #include <langinfo.h> | ||
29 | int main (int argc, char ** argv) { | ||
30 | char *str; | ||
31 | - str = nl_langinfo (_NL_ALTMON_1); | ||
32 | - str = nl_langinfo (_NL_ALTMON_2); | ||
33 | - str = nl_langinfo (_NL_ALTMON_3); | ||
34 | - str = nl_langinfo (_NL_ALTMON_4); | ||
35 | - str = nl_langinfo (_NL_ALTMON_5); | ||
36 | - str = nl_langinfo (_NL_ALTMON_6); | ||
37 | - str = nl_langinfo (_NL_ALTMON_7); | ||
38 | - str = nl_langinfo (_NL_ALTMON_8); | ||
39 | - str = nl_langinfo (_NL_ALTMON_9); | ||
40 | - str = nl_langinfo (_NL_ALTMON_10); | ||
41 | - str = nl_langinfo (_NL_ALTMON_11); | ||
42 | - str = nl_langinfo (_NL_ALTMON_12); | ||
43 | + str = nl_langinfo (_NL_ABALTMON_1); | ||
44 | + str = nl_langinfo (_NL_ABALTMON_2); | ||
45 | + str = nl_langinfo (_NL_ABALTMON_3); | ||
46 | + str = nl_langinfo (_NL_ABALTMON_4); | ||
47 | + str = nl_langinfo (_NL_ABALTMON_5); | ||
48 | + str = nl_langinfo (_NL_ABALTMON_6); | ||
49 | + str = nl_langinfo (_NL_ABALTMON_7); | ||
50 | + str = nl_langinfo (_NL_ABALTMON_8); | ||
51 | + str = nl_langinfo (_NL_ABALTMON_9); | ||
52 | + str = nl_langinfo (_NL_ABALTMON_10); | ||
53 | + str = nl_langinfo (_NL_ABALTMON_11); | ||
54 | + str = nl_langinfo (_NL_ABALTMON_12); | ||
55 | return 0; | ||
56 | - }''', name : 'nl_langinfo (_NL_ALTMON_n)') | ||
57 | + }''', name : 'nl_langinfo (_NL_ABALTMON_n)') | ||
58 | glib_conf.set('HAVE_LANGINFO_ABALTMON', 1) | ||
59 | endif | ||
60 | |||
61 | -- | ||
62 | 2.18.1 | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb index 733a2d46d9..d749be34ee 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb | |||
@@ -17,6 +17,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
17 | file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ | 17 | file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ |
18 | file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ | 18 | file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ |
19 | file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \ | 19 | file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \ |
20 | file://fix-nl-abaltmon.patch \ | ||
20 | file://glib-meson.cross \ | 21 | file://glib-meson.cross \ |
21 | " | 22 | " |
22 | 23 | ||