diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-07-25 01:16:29 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-26 08:56:26 +0100 |
commit | cff21235c20adc2cfceb7923e3dc9c276445b29c (patch) | |
tree | 820b223514c36049043673f3f393857a7e6dfa28 /meta/recipes-core/gettext/gettext-0.19.8.1 | |
parent | 91a6f3a3756219ae91435d60a0ceb8fd36fd056f (diff) | |
download | poky-cff21235c20adc2cfceb7923e3dc9c276445b29c.tar.gz |
gettext: 0.19.6 -> 0.19.8.1
(From OE-Core rev: 450f4597d491789b0680940218e0e0bee7104ada)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/gettext/gettext-0.19.8.1')
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch | 58 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch | 23 |
2 files changed, 81 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch b/meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch new file mode 100644 index 0000000000..35a131067a --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | From 04bd40fe2c48c6e01ab418a04d27c4aff644ad96 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Wed, 17 Feb 2016 23:54:02 -0500 | ||
4 | Subject: [PATCH] m4/bison-i18n.m4: add --with-bisonlocaledir to assign | ||
5 | BISON_LOCALEDIR | ||
6 | |||
7 | The variable BISON_LOCALEDIR is assigned only by the output of | ||
8 | 'bison --print-localedir', we add option --with-bisonlocaledir | ||
9 | to assign it explicitly. It is helpful for user to split the | ||
10 | native compile and cross compile. | ||
11 | |||
12 | For backward compatibility, if option not used, it still | ||
13 | make use of the output of 'bison --print-localedir'. | ||
14 | |||
15 | Upstream-Status: Submitted [bison-patches@gnu.org] | ||
16 | |||
17 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
18 | --- | ||
19 | gettext-tools/gnulib-m4/bison-i18n.m4 | 10 ++++++++-- | ||
20 | 1 file changed, 8 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/gettext-tools/gnulib-m4/bison-i18n.m4 b/gettext-tools/gnulib-m4/bison-i18n.m4 | ||
23 | index f5cfd3a..fb6ac4d 100644 | ||
24 | --- a/gettext-tools/gnulib-m4/bison-i18n.m4 | ||
25 | +++ b/gettext-tools/gnulib-m4/bison-i18n.m4 | ||
26 | @@ -14,11 +14,16 @@ dnl sets BISON_LOCALEDIR to indicate where to find the bison-runtime.mo files | ||
27 | dnl and defines YYENABLE_NLS if there are bison-runtime.mo files at all. | ||
28 | AC_DEFUN([BISON_I18N], | ||
29 | [ | ||
30 | + dnl Default is not to set bisonlocaledir | ||
31 | + AC_ARG_WITH([bisonlocaledir], | ||
32 | + [ --with-bisonlocaledir sets BISON_LOCALEDIR to indicate where to find the bison-runtime.mo files], | ||
33 | + BISON_LOCALEDIR=$withval, | ||
34 | + BISON_LOCALEDIR=) | ||
35 | + | ||
36 | if test -z "$USE_NLS"; then | ||
37 | echo "The BISON-I18N macro is used without being preceded by AM-GNU-GETTEXT." 1>&2 | ||
38 | exit 1 | ||
39 | fi | ||
40 | - BISON_LOCALEDIR= | ||
41 | BISON_USE_NLS=no | ||
42 | if test "$USE_NLS" = yes; then | ||
43 | dnl Determine bison's localedir. | ||
44 | @@ -26,9 +31,10 @@ AC_DEFUN([BISON_I18N], | ||
45 | dnl But even is YACC is called "yacc", it may be a script that invokes bison | ||
46 | dnl and accepts the --print-localedir option. | ||
47 | dnl YACC's default value is empty; BISON's default value is :. | ||
48 | - if (${YACC-${BISON-:}} --print-localedir) >/dev/null 2>&1; then | ||
49 | + if test -z "$BISON_LOCALEDIR" -a ${YACC-${BISON-:}} --print-localedir >/dev/null 2>&1; then | ||
50 | BISON_LOCALEDIR=`${YACC-${BISON-:}} --print-localedir` | ||
51 | fi | ||
52 | + AC_MSG_RESULT([$BISON_LOCALEDIR]) | ||
53 | AC_SUBST([BISON_LOCALEDIR]) | ||
54 | if test -n "$BISON_LOCALEDIR"; then | ||
55 | dnl There is no need to enable internationalization if the user doesn't | ||
56 | -- | ||
57 | 1.9.1 | ||
58 | |||
diff --git a/meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch b/meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch new file mode 100644 index 0000000000..c8e2c94af0 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | instal libgettextlib.a before removing it | ||
2 | |||
3 | In a multiple job build, Makefile can simultaneously | ||
4 | be installing and removing libgettextlib.a. We serialize | ||
5 | the operations. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Joe Slater <jslater@windriver.com> | ||
10 | |||
11 | --- a/gettext-tools/gnulib-lib/Makefile.am | ||
12 | +++ b/gettext-tools/gnulib-lib/Makefile.am | ||
13 | @@ -57,6 +57,10 @@ endif | ||
14 | # Rules generated and collected by gnulib-tool. | ||
15 | include Makefile.gnulib | ||
16 | |||
17 | +# defined in Makefile.gnulib but missing this dependency | ||
18 | +# | ||
19 | +install-exec-clean: install-libLTLIBRARIES | ||
20 | + | ||
21 | # Which classes to export from the shared library. | ||
22 | MOOPPFLAGS += --dllexport=styled_ostream | ||
23 | |||