diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-10-11 13:47:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-15 14:16:10 +0100 |
commit | 004574ae37cbe2329bdc2d684dc14cd5f5ec50ad (patch) | |
tree | f57b6609eafcd4b0864990ee6a65d97d96ae7160 /meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | |
parent | 73edefb0b9309dc82f3294f747e0c16c2c80be3a (diff) | |
download | poky-004574ae37cbe2329bdc2d684dc14cd5f5ec50ad.tar.gz |
glib-2.0: upgrade to 2.62.1
Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch where
upstream has removed the problematic bit.
(From OE-Core rev: 5a0de7b1ee37d52f3bf013301030a2679a8c0a9f)
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-Fix-DATADIRNAME-on-uclibc-Linux.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch new file mode 100644 index 0000000000..d8cf269bb8 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 15 Mar 2014 22:42:29 -0700 | ||
4 | Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux | ||
5 | |||
6 | translation files are always installed under PREFIX/share/locale in uclibc | ||
7 | based systems therefore lets set DATADIRNAME to "share". | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | Upstream-Status: Pending | ||
11 | |||
12 | %% original patch: uclibc_musl_translation.patch | ||
13 | --- | ||
14 | m4macros/glib-gettext.m4 | 4 ++++ | ||
15 | 1 file changed, 4 insertions(+) | ||
16 | |||
17 | diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 | ||
18 | index df6fbf0..47db864 100644 | ||
19 | --- a/m4macros/glib-gettext.m4 | ||
20 | +++ b/m4macros/glib-gettext.m4 | ||
21 | @@ -293,6 +293,10 @@ msgstr "" | ||
22 | CATOBJEXT=.mo | ||
23 | DATADIRNAME=share | ||
24 | ;; | ||
25 | + *-*-musl* | *-*-linux-uclibc*) | ||
26 | + CATOBJEXT=.gmo | ||
27 | + DATADIRNAME=share | ||
28 | + ;; | ||
29 | *) | ||
30 | CATOBJEXT=.mo | ||
31 | DATADIRNAME=lib | ||
32 | -- | ||
33 | 2.17.1 | ||
34 | |||