diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-08-23 22:20:28 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-25 16:00:11 +0100 |
commit | 2457432ad9a1f232dd67e06918bc2d7e3831d305 (patch) | |
tree | c4651d363bf6201bbc17e076d2933d6b62280242 /meta | |
parent | 742c773a93d1b7a5ca9d2f04e15492b170439180 (diff) | |
download | poky-2457432ad9a1f232dd67e06918bc2d7e3831d305.tar.gz |
gettext: update 0.20.2 -> 0.21
Drop add-with-bisonlocaledir.patch as upstream (gnulib, not bison)
now determines the directory from datadir.
(From OE-Core rev: 8a89c77e5b5a7915b9cce4979ee8caa593847e51)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch | 58 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch (renamed from meta/recipes-core/gettext/gettext-0.20.2/0001-init-env.in-do-not-add-C-CXX-parameters.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch (renamed from meta/recipes-core/gettext/gettext-0.20.2/0001-tests-autopoint-3-unset-MAKEFLAGS.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/mingw.patch | 28 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/parallel.patch (renamed from meta/recipes-core/gettext/gettext-0.20.2/parallel.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/run-ptest (renamed from meta/recipes-core/gettext/gettext-0.20.2/run-ptest) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch (renamed from meta/recipes-core/gettext/gettext-0.20.2/serial-tests-config.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch (renamed from meta/recipes-core/gettext/gettext-0.20.2/use-pkgconfig.patch) | 16 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/COPYING (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/COPYING) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/Makefile.in.in) | 9 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/gettext.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/host-cpu-c-abi.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/iconv.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/intlmacosx.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-ld.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-link.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-prefix.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/nls.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/po.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/progtest.m4) | 0 | ||||
-rwxr-xr-x | meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/config.rpath) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/remove-potcdate.sin) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-native_0.21.bb (renamed from meta/recipes-core/gettext/gettext-minimal-native_0.20.2.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext_0.21.bb (renamed from meta/recipes-core/gettext/gettext_0.20.2.bb) | 7 |
24 files changed, 46 insertions, 72 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch b/meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch deleted file mode 100644 index 35a131067a..0000000000 --- a/meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
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.20.2/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch index d45b75869a..d45b75869a 100644 --- a/meta/recipes-core/gettext/gettext-0.20.2/0001-init-env.in-do-not-add-C-CXX-parameters.patch +++ b/meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch | |||
diff --git a/meta/recipes-core/gettext/gettext-0.20.2/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch index b0bc6b97a6..b0bc6b97a6 100644 --- a/meta/recipes-core/gettext/gettext-0.20.2/0001-tests-autopoint-3-unset-MAKEFLAGS.patch +++ b/meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch | |||
diff --git a/meta/recipes-core/gettext/gettext-0.21/mingw.patch b/meta/recipes-core/gettext/gettext-0.21/mingw.patch new file mode 100644 index 0000000000..b062c784f6 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.21/mingw.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 7cf68dffb2adb76375bfb0781e277510523a1f3e Mon Sep 17 00:00:00 2001 | ||
2 | From: Michele Locati <michele@locati.it> | ||
3 | Date: Thu, 30 Jul 2020 18:58:02 +0200 | ||
4 | Subject: [PATCH] build: Fix build failure on Cygwin and mingw. | ||
5 | |||
6 | * gettext-tools/woe32dll/gettextsrc-exports.c: Export formatstring_ruby. | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | gettext-tools/woe32dll/gettextsrc-exports.c | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/gettext-tools/woe32dll/gettextsrc-exports.c b/gettext-tools/woe32dll/gettextsrc-exports.c | ||
15 | index 4477ae8..6d76089 100644 | ||
16 | --- a/gettext-tools/woe32dll/gettextsrc-exports.c | ||
17 | +++ b/gettext-tools/woe32dll/gettextsrc-exports.c | ||
18 | @@ -50,6 +50,7 @@ VARIABLE(formatstring_python) | ||
19 | VARIABLE(formatstring_python_brace) | ||
20 | VARIABLE(formatstring_qt) | ||
21 | VARIABLE(formatstring_qt_plural) | ||
22 | +VARIABLE(formatstring_ruby) | ||
23 | VARIABLE(formatstring_scheme) | ||
24 | VARIABLE(formatstring_sh) | ||
25 | VARIABLE(formatstring_smalltalk) | ||
26 | -- | ||
27 | 1.9.1 | ||
28 | |||
diff --git a/meta/recipes-core/gettext/gettext-0.20.2/parallel.patch b/meta/recipes-core/gettext/gettext-0.21/parallel.patch index d96a376b7d..d96a376b7d 100644 --- a/meta/recipes-core/gettext/gettext-0.20.2/parallel.patch +++ b/meta/recipes-core/gettext/gettext-0.21/parallel.patch | |||
diff --git a/meta/recipes-core/gettext/gettext-0.20.2/run-ptest b/meta/recipes-core/gettext/gettext-0.21/run-ptest index f17f3c87a7..f17f3c87a7 100644 --- a/meta/recipes-core/gettext/gettext-0.20.2/run-ptest +++ b/meta/recipes-core/gettext/gettext-0.21/run-ptest | |||
diff --git a/meta/recipes-core/gettext/gettext-0.20.2/serial-tests-config.patch b/meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch index 93f7c03334..93f7c03334 100644 --- a/meta/recipes-core/gettext/gettext-0.20.2/serial-tests-config.patch +++ b/meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch | |||
diff --git a/meta/recipes-core/gettext/gettext-0.20.2/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch index feb56719d7..fc77feb270 100644 --- a/meta/recipes-core/gettext/gettext-0.20.2/use-pkgconfig.patch +++ b/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c832880c5242b454a2c9e61b6a2dc26aecdc51bd Mon Sep 17 00:00:00 2001 | 1 | From 15647f679834be633fb4a9aeff4671b9cb95ccb8 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 23 Jan 2018 00:54:13 +0000 | 3 | Date: Tue, 23 Jan 2018 00:54:13 +0000 |
4 | Subject: [PATCH] gettext: beat library detection into shape | 4 | Subject: [PATCH] gettext: beat library detection into shape |
@@ -25,7 +25,7 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
25 | 8 files changed, 83 insertions(+), 450 deletions(-) | 25 | 8 files changed, 83 insertions(+), 450 deletions(-) |
26 | 26 | ||
27 | diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4 | 27 | diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4 |
28 | index 05b9550..031ee65 100644 | 28 | index 2f80c37..30ce58e 100644 |
29 | --- a/gettext-tools/gnulib-m4/libxml.m4 | 29 | --- a/gettext-tools/gnulib-m4/libxml.m4 |
30 | +++ b/gettext-tools/gnulib-m4/libxml.m4 | 30 | +++ b/gettext-tools/gnulib-m4/libxml.m4 |
31 | @@ -13,6 +13,7 @@ dnl gl_LIBXML(FORCE-INCLUDED) | 31 | @@ -13,6 +13,7 @@ dnl gl_LIBXML(FORCE-INCLUDED) |
@@ -142,7 +142,7 @@ index 05b9550..031ee65 100644 | |||
142 | ]) | 142 | ]) |
143 | AC_SUBST([LIBXML]) | 143 | AC_SUBST([LIBXML]) |
144 | diff --git a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c | 144 | diff --git a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c |
145 | index 2cfd4a8..d42c8b4 100644 | 145 | index 2ff978f..5ffb17a 100644 |
146 | --- a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c | 146 | --- a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c |
147 | +++ b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c | 147 | +++ b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c |
148 | @@ -22,15 +22,15 @@ | 148 | @@ -22,15 +22,15 @@ |
@@ -166,7 +166,7 @@ index 2cfd4a8..d42c8b4 100644 | |||
166 | +#include <libcroco/cr-string.h> | 166 | +#include <libcroco/cr-string.h> |
167 | 167 | ||
168 | #include "term-ostream.h" | 168 | #include "term-ostream.h" |
169 | #include "hash.h" | 169 | #include "mem-hash-map.h" |
170 | diff --git a/libtextstyle/gnulib-local/m4/libcroco.m4 b/libtextstyle/gnulib-local/m4/libcroco.m4 | 170 | diff --git a/libtextstyle/gnulib-local/m4/libcroco.m4 b/libtextstyle/gnulib-local/m4/libcroco.m4 |
171 | index bc53cc6..10b2455 100644 | 171 | index bc53cc6..10b2455 100644 |
172 | --- a/libtextstyle/gnulib-local/m4/libcroco.m4 | 172 | --- a/libtextstyle/gnulib-local/m4/libcroco.m4 |
@@ -646,7 +646,7 @@ index 5853772..767fba2 100644 | |||
646 | AC_SUBST([LTLIBGLIB]) | 646 | AC_SUBST([LTLIBGLIB]) |
647 | AC_SUBST([INCGLIB]) | 647 | AC_SUBST([INCGLIB]) |
648 | diff --git a/libtextstyle/lib/term-styled-ostream.c b/libtextstyle/lib/term-styled-ostream.c | 648 | diff --git a/libtextstyle/lib/term-styled-ostream.c b/libtextstyle/lib/term-styled-ostream.c |
649 | index 3675b5f..811e546 100644 | 649 | index 5484800..16793fa 100644 |
650 | --- a/libtextstyle/lib/term-styled-ostream.c | 650 | --- a/libtextstyle/lib/term-styled-ostream.c |
651 | +++ b/libtextstyle/lib/term-styled-ostream.c | 651 | +++ b/libtextstyle/lib/term-styled-ostream.c |
652 | @@ -28,15 +28,15 @@ | 652 | @@ -28,15 +28,15 @@ |
@@ -670,9 +670,9 @@ index 3675b5f..811e546 100644 | |||
670 | +#include <libcroco/cr-string.h> | 670 | +#include <libcroco/cr-string.h> |
671 | 671 | ||
672 | #include "term-ostream.h" | 672 | #include "term-ostream.h" |
673 | #include "hash.h" | 673 | #include "mem-hash-map.h" |
674 | diff --git a/libtextstyle/lib/term-styled-ostream.oo.c b/libtextstyle/lib/term-styled-ostream.oo.c | 674 | diff --git a/libtextstyle/lib/term-styled-ostream.oo.c b/libtextstyle/lib/term-styled-ostream.oo.c |
675 | index 2cfd4a8..d42c8b4 100644 | 675 | index 2ff978f..5ffb17a 100644 |
676 | --- a/libtextstyle/lib/term-styled-ostream.oo.c | 676 | --- a/libtextstyle/lib/term-styled-ostream.oo.c |
677 | +++ b/libtextstyle/lib/term-styled-ostream.oo.c | 677 | +++ b/libtextstyle/lib/term-styled-ostream.oo.c |
678 | @@ -22,15 +22,15 @@ | 678 | @@ -22,15 +22,15 @@ |
@@ -696,4 +696,4 @@ index 2cfd4a8..d42c8b4 100644 | |||
696 | +#include <libcroco/cr-string.h> | 696 | +#include <libcroco/cr-string.h> |
697 | 697 | ||
698 | #include "term-ostream.h" | 698 | #include "term-ostream.h" |
699 | #include "hash.h" | 699 | #include "mem-hash-map.h" |
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/COPYING b/meta/recipes-core/gettext/gettext-minimal-0.21/COPYING index 3671ab6985..3671ab6985 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/COPYING +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/COPYING | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/Makefile.in.in b/meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in index de980e040a..6b25f0d916 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/Makefile.in.in +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in | |||
@@ -7,7 +7,7 @@ | |||
7 | # notice and this notice are preserved. This file is offered as-is, | 7 | # notice and this notice are preserved. This file is offered as-is, |
8 | # without any warranty. | 8 | # without any warranty. |
9 | # | 9 | # |
10 | # Origin: gettext-0.20.2 | 10 | # Origin: gettext-0.21 |
11 | GETTEXT_MACRO_VERSION = 0.20 | 11 | GETTEXT_MACRO_VERSION = 0.20 |
12 | 12 | ||
13 | PACKAGE = @PACKAGE@ | 13 | PACKAGE = @PACKAGE@ |
@@ -415,12 +415,17 @@ dist distdir: | |||
415 | @$(MAKE) dist2 | 415 | @$(MAKE) dist2 |
416 | # This is a separate target because 'update-po' must be executed before. | 416 | # This is a separate target because 'update-po' must be executed before. |
417 | dist2: $(srcdir)/stamp-po $(DISTFILES) | 417 | dist2: $(srcdir)/stamp-po $(DISTFILES) |
418 | dists="$(DISTFILES)"; \ | 418 | @dists="$(DISTFILES)"; \ |
419 | if test "$(PACKAGE)" = "gettext-tools"; then \ | 419 | if test "$(PACKAGE)" = "gettext-tools"; then \ |
420 | dists="$$dists Makevars.template"; \ | 420 | dists="$$dists Makevars.template"; \ |
421 | fi; \ | 421 | fi; \ |
422 | if test -f $(srcdir)/$(DOMAIN).pot; then \ | 422 | if test -f $(srcdir)/$(DOMAIN).pot; then \ |
423 | dists="$$dists $(DOMAIN).pot stamp-po"; \ | 423 | dists="$$dists $(DOMAIN).pot stamp-po"; \ |
424 | else \ | ||
425 | case $(XGETTEXT) in \ | ||
426 | :) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because a suitable 'xgettext' program was not found in PATH." 1>&2;; \ | ||
427 | *) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because 'xgettext' found no strings to extract. Check the contents of the POTFILES.in file and the XGETTEXT_OPTIONS in the Makevars file." 1>&2;; \ | ||
428 | esac; \ | ||
424 | fi; \ | 429 | fi; \ |
425 | if test -f $(srcdir)/ChangeLog; then \ | 430 | if test -f $(srcdir)/ChangeLog; then \ |
426 | dists="$$dists ChangeLog"; \ | 431 | dists="$$dists ChangeLog"; \ |
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/gettext.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4 index 4f25a27d93..4f25a27d93 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/gettext.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4 | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/host-cpu-c-abi.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4 index 6db2aa25ae..6db2aa25ae 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/host-cpu-c-abi.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4 | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/iconv.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 index e593b7270a..e593b7270a 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/iconv.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/intlmacosx.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4 index ebd9937c1a..ebd9937c1a 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/intlmacosx.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4 | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-ld.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4 index 98c348faff..98c348faff 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-ld.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4 | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-link.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4 index eecf70ec76..eecf70ec76 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-link.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4 | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-prefix.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4 index c8a0b464c2..c8a0b464c2 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-prefix.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4 | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/nls.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4 index 5a506fc4b5..5a506fc4b5 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/nls.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4 | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/po.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4 index 3778fd7aac..3778fd7aac 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/po.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4 | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/progtest.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4 index f28010aed1..f28010aed1 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/progtest.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4 | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/config.rpath b/meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath index 24be79cfb6..24be79cfb6 100755 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/config.rpath +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin index 8c70dfbf14..8c70dfbf14 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/remove-potcdate.sin +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.20.2.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.21.bb index 7a4dcbec57..7a4dcbec57 100644 --- a/meta/recipes-core/gettext/gettext-minimal-native_0.20.2.bb +++ b/meta/recipes-core/gettext/gettext-minimal-native_0.21.bb | |||
diff --git a/meta/recipes-core/gettext/gettext_0.20.2.bb b/meta/recipes-core/gettext/gettext_0.21.bb index fda11c44cc..54305623dd 100644 --- a/meta/recipes-core/gettext/gettext_0.20.2.bb +++ b/meta/recipes-core/gettext/gettext_0.21.bb | |||
@@ -18,15 +18,14 @@ PROVIDES_class-native = "virtual/gettext-native" | |||
18 | RCONFLICTS_${PN} = "proxy-libintl" | 18 | RCONFLICTS_${PN} = "proxy-libintl" |
19 | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ | 19 | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ |
20 | file://parallel.patch \ | 20 | file://parallel.patch \ |
21 | file://add-with-bisonlocaledir.patch \ | ||
22 | file://use-pkgconfig.patch \ | 21 | file://use-pkgconfig.patch \ |
23 | file://run-ptest \ | 22 | file://run-ptest \ |
24 | file://serial-tests-config.patch \ | 23 | file://serial-tests-config.patch \ |
25 | file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ | 24 | file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ |
26 | file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ | 25 | file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ |
26 | file://mingw.patch \ | ||
27 | " | 27 | " |
28 | SRC_URI[md5sum] = "30fec34a895fab4c02584449c500aac2" | 28 | SRC_URI[sha256sum] = "c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12" |
29 | SRC_URI[sha256sum] = "ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1" | ||
30 | 29 | ||
31 | inherit autotools texinfo pkgconfig ptest | 30 | inherit autotools texinfo pkgconfig ptest |
32 | 31 | ||
@@ -130,7 +129,7 @@ do_install_append_class-native () { | |||
130 | rm ${D}${datadir}/gettext/po/remove-potcdate.sin | 129 | rm ${D}${datadir}/gettext/po/remove-potcdate.sin |
131 | 130 | ||
132 | create_wrapper ${D}${bindir}/msgfmt \ | 131 | create_wrapper ${D}${bindir}/msgfmt \ |
133 | GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.20.2/" | 132 | GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-${PV}/" |
134 | 133 | ||
135 | } | 134 | } |
136 | 135 | ||