summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-31 17:52:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:31 +0100
commit4c3d44207b3c4013537ef421529f150ff6ee7aab (patch)
tree91087f5e33f1f10a442fc39f11f9527fd3515dd8 /meta
parent79400a1042e24d38752ffdc1288aefe3415c6c11 (diff)
downloadpoky-4c3d44207b3c4013537ef421529f150ff6ee7aab.tar.gz
gettext: update 0.20.1 -> 0.20.2
(From OE-Core rev: 2419443c02496c2f58f2d6ce093a3c2aa71eedb4) 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.1/0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch87
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch71
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.2/0001-init-env.in-do-not-add-C-CXX-parameters.patch (renamed from meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch)0
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.2/0001-tests-autopoint-3-unset-MAKEFLAGS.patch (renamed from meta/recipes-core/gettext/gettext-0.20.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch)0
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch (renamed from meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch)0
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.2/parallel.patch (renamed from meta/recipes-core/gettext/gettext-0.20.1/parallel.patch)0
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.2/run-ptest (renamed from meta/recipes-core/gettext/gettext-0.20.1/run-ptest)0
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.2/serial-tests-config.patch (renamed from meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch)0
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.2/use-pkgconfig.patch (renamed from meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch)36
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/COPYING (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING)0
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/Makefile.in.in (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/Makefile.in.in)12
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/gettext.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4)8
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/host-cpu-c-abi.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4)45
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/iconv.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4)2
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/intlmacosx.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4)33
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-ld.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4)2
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-link.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4)154
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-prefix.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4)203
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/nls.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4)10
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/po.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4)8
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/progtest.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4)8
-rwxr-xr-xmeta/recipes-core/gettext/gettext-minimal-0.20.2/config.rpath (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath)2
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.2/remove-potcdate.sin (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin)0
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-native_0.20.2.bb (renamed from meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb)0
-rw-r--r--meta/recipes-core/gettext/gettext_0.20.2.bb (renamed from meta/recipes-core/gettext/gettext_0.20.1.bb)8
25 files changed, 319 insertions, 370 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch b/meta/recipes-core/gettext/gettext-0.20.1/0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch
deleted file mode 100644
index 2245889386..0000000000
--- a/meta/recipes-core/gettext/gettext-0.20.1/0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch
+++ /dev/null
@@ -1,87 +0,0 @@
1From 75e315fdec82d1a17ebcd9e0712d109323578d68 Mon Sep 17 00:00:00 2001
2From: Bruno Haible <bruno@clisp.org>
3Date: Sun, 19 May 2019 11:10:06 +0200
4Subject: [PATCH] msgmerge: Fix behaviour of --for-msgfmt on PO files with no
5 translations.
6
7msgmerge: Fix behaviour of --for-msgfmt on PO files with no translations.
8
9Reported by Don Lawrence <dlawrence@iecok.com>
10in <https://lists.freedesktop.org/archives/p11-glue/2019-May/000700.html>
11via Daiki Ueno
12in <https://lists.gnu.org/archive/html/bug-gettext/2019-05/msg00124.html>.
13
14* gettext-tools/src/msgmerge.c (main): Treat force_po like true if for_msgfmt
15is true.
16* gettext-tools/tests/msgmerge-26: Add test of PO file with no translations.
17
18Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff;h=2336451ed68d91ff4b5ae1acbc1eca30e47a86a9]
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 gettext-tools/src/msgmerge.c | 4 ++--
22 gettext-tools/tests/msgmerge-26 | 36 ++++++++++++++++++++++++++++++---
23 2 files changed, 35 insertions(+), 5 deletions(-)
24
25diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
26index cd762c0..92c9b7a 100644
27--- a/gettext-tools/src/msgmerge.c
28+++ b/gettext-tools/src/msgmerge.c
29@@ -520,8 +520,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\
30 else
31 {
32 /* Write the merged message list out. */
33- msgdomain_list_print (result, output_file, output_syntax, force_po,
34- false);
35+ msgdomain_list_print (result, output_file, output_syntax,
36+ for_msgfmt || force_po, false);
37 }
38
39 exit (EXIT_SUCCESS);
40diff --git a/gettext-tools/tests/msgmerge-26 b/gettext-tools/tests/msgmerge-26
41index cd3862e..b86f7a0 100755
42--- a/gettext-tools/tests/msgmerge-26
43+++ b/gettext-tools/tests/msgmerge-26
44@@ -73,7 +73,37 @@ msgstr "Papaya"
45 EOF
46
47 : ${DIFF=diff}
48-${DIFF} mm-test26.ok mm-test26.out
49-result=$?
50+${DIFF} mm-test26.ok mm-test26.out || Exit 1
51
52-exit $result
53+# Test with a PO file that has no translated messages.
54+
55+cat <<\EOF > mm-test26a.in1
56+msgid ""
57+msgstr ""
58+"Content-Type: text/plain; charset=UTF-8\n"
59+
60+msgid "Hello world"
61+msgstr "Hallo Welt"
62+EOF
63+
64+cat <<\EOF > mm-test26a.in2
65+msgid ""
66+msgstr ""
67+"Content-Type: text/plain; charset=ASCII\n"
68+
69+msgid "Hello, world!"
70+msgstr ""
71+EOF
72+
73+: ${MSGMERGE=msgmerge}
74+${MSGMERGE} --for-msgfmt -o mm-test26a.tmp mm-test26a.in1 mm-test26a.in2 \
75+ || Exit 1
76+LC_ALL=C tr -d '\r' < mm-test26a.tmp > mm-test26a.out || Exit 1
77+
78+cat <<\EOF > mm-test26a.ok
79+msgid ""
80+msgstr "Content-Type: text/plain; charset=UTF-8\n"
81+EOF
82+
83+: ${DIFF=diff}
84+${DIFF} mm-test26a.ok mm-test26a.out || Exit 1
85--
862.24.1
87
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch b/meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
deleted file mode 100644
index 0561ed7d32..0000000000
--- a/meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1From f6245ef5530fc37a6243e798df34162fbbeab6f0 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sun, 19 Feb 2017 23:32:46 -0800
4Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues
5
6Fixed when compile with "-Wformat -Wformat-security -Werror=format-security":
7| gettext-tools/gnulib-lib/libcroco/cr-statement.c: In function 'cr_statement_dump_charset':
8| gettext-tools/gnulib-lib/libcroco/cr-statement.c:2661:17: error: format not a string literal and no format arguments [-Werror=format-security]
9| fprintf (a_fp, str) ;
10
11And:
12gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat=]
13 fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
14
15Upstream-Status: Pending
16
17Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
18
19---
20 libtextstyle/lib/libcroco/cr-statement.c | 10 +++++-----
21 1 file changed, 5 insertions(+), 5 deletions(-)
22
23diff --git a/libtextstyle/lib/libcroco/cr-statement.c b/libtextstyle/lib/libcroco/cr-statement.c
24index 617520f..100104b 100644
25--- a/libtextstyle/lib/libcroco/cr-statement.c
26+++ b/libtextstyle/lib/libcroco/cr-statement.c
27@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent)
28 g_return_if_fail (a_fp && a_this);
29 str = cr_statement_ruleset_to_string (a_this, a_indent);
30 if (str) {
31- fprintf (a_fp, str);
32+ fprintf (a_fp, "%s", str);
33 g_free (str);
34 str = NULL;
35 }
36@@ -2658,7 +2658,7 @@ cr_statement_dump_charset (CRStatement * a_this, FILE * a_fp, gulong a_indent)
37 str = cr_statement_charset_to_string (a_this,
38 a_indent) ;
39 if (str) {
40- fprintf (a_fp, str) ;
41+ fprintf (a_fp, "%s", str) ;
42 g_free (str) ;
43 str = NULL ;
44 }
45@@ -2685,7 +2685,7 @@ cr_statement_dump_page (CRStatement * a_this, FILE * a_fp, gulong a_indent)
46
47 str = cr_statement_at_page_rule_to_string (a_this, a_indent) ;
48 if (str) {
49- fprintf (a_fp, str);
50+ fprintf (a_fp, "%s", str);
51 g_free (str) ;
52 str = NULL ;
53 }
54@@ -2711,7 +2711,7 @@ cr_statement_dump_media_rule (CRStatement * a_this,
55
56 str = cr_statement_media_rule_to_string (a_this, a_indent) ;
57 if (str) {
58- fprintf (a_fp, str) ;
59+ fprintf (a_fp, "%s", str) ;
60 g_free (str) ;
61 str = NULL ;
62 }
63@@ -2737,7 +2737,7 @@ cr_statement_dump_import_rule (CRStatement * a_this, FILE * a_fp,
64
65 str = cr_statement_import_rule_to_string (a_this, a_indent) ;
66 if (str) {
67- fprintf (a_fp, str) ;
68+ fprintf (a_fp, "%s", str) ;
69 g_free (str) ;
70 str = NULL ;
71 }
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext-0.20.2/0001-init-env.in-do-not-add-C-CXX-parameters.patch
index d45b75869a..d45b75869a 100644
--- a/meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch
+++ b/meta/recipes-core/gettext/gettext-0.20.2/0001-init-env.in-do-not-add-C-CXX-parameters.patch
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext-0.20.2/0001-tests-autopoint-3-unset-MAKEFLAGS.patch
index b0bc6b97a6..b0bc6b97a6 100644
--- a/meta/recipes-core/gettext/gettext-0.20.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch
+++ b/meta/recipes-core/gettext/gettext-0.20.2/0001-tests-autopoint-3-unset-MAKEFLAGS.patch
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch b/meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch
index 35a131067a..35a131067a 100644
--- a/meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch
+++ b/meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/parallel.patch b/meta/recipes-core/gettext/gettext-0.20.2/parallel.patch
index d96a376b7d..d96a376b7d 100644
--- a/meta/recipes-core/gettext/gettext-0.20.1/parallel.patch
+++ b/meta/recipes-core/gettext/gettext-0.20.2/parallel.patch
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/run-ptest b/meta/recipes-core/gettext/gettext-0.20.2/run-ptest
index f17f3c87a7..f17f3c87a7 100644
--- a/meta/recipes-core/gettext/gettext-0.20.1/run-ptest
+++ b/meta/recipes-core/gettext/gettext-0.20.2/run-ptest
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch b/meta/recipes-core/gettext/gettext-0.20.2/serial-tests-config.patch
index 93f7c03334..93f7c03334 100644
--- a/meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch
+++ b/meta/recipes-core/gettext/gettext-0.20.2/serial-tests-config.patch
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext-0.20.2/use-pkgconfig.patch
index d3f3fe8e2f..feb56719d7 100644
--- a/meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch
+++ b/meta/recipes-core/gettext/gettext-0.20.2/use-pkgconfig.patch
@@ -1,4 +1,4 @@
1From ef414b06be80c6f605731abc9e674e396b80ec9e Mon Sep 17 00:00:00 2001 1From c832880c5242b454a2c9e61b6a2dc26aecdc51bd Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 23 Jan 2018 00:54:13 +0000 3Date: Tue, 23 Jan 2018 00:54:13 +0000
4Subject: [PATCH] gettext: beat library detection into shape 4Subject: [PATCH] gettext: beat library detection into shape
@@ -15,14 +15,14 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
15 15
16--- 16---
17 gettext-tools/gnulib-m4/libxml.m4 | 99 +---------------- 17 gettext-tools/gnulib-m4/libxml.m4 | 99 +----------------
18 .../gnulib-local/lib/term-styled-ostream.oo.c | 12 +- 18 .../gnulib-local/lib/term-styled-ostream.oo.c | 12 +--
19 libtextstyle/gnulib-local/m4/libcroco.m4 | 99 +++-------------- 19 libtextstyle/gnulib-local/m4/libcroco.m4 | 99 +++--------------
20 libtextstyle/gnulib-local/m4/libglib.m4 | 104 +++--------------- 20 libtextstyle/gnulib-local/m4/libglib.m4 | 100 +++---------------
21 libtextstyle/gnulib-m4/libcroco.m4 | 99 +++-------------- 21 libtextstyle/gnulib-m4/libcroco.m4 | 99 +++--------------
22 libtextstyle/gnulib-m4/libglib.m4 | 104 +++--------------- 22 libtextstyle/gnulib-m4/libglib.m4 | 100 +++---------------
23 libtextstyle/lib/term-styled-ostream.c | 12 +- 23 libtextstyle/lib/term-styled-ostream.c | 12 +--
24 libtextstyle/lib/term-styled-ostream.oo.c | 12 +- 24 libtextstyle/lib/term-styled-ostream.oo.c | 12 +--
25 8 files changed, 87 insertions(+), 454 deletions(-) 25 8 files changed, 83 insertions(+), 450 deletions(-)
26 26
27diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4 27diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4
28index 05b9550..031ee65 100644 28index 05b9550..031ee65 100644
@@ -289,17 +289,10 @@ index bc53cc6..10b2455 100644
289 AC_SUBST([LTLIBCROCO]) 289 AC_SUBST([LTLIBCROCO])
290 AC_SUBST([INCCROCO]) 290 AC_SUBST([INCCROCO])
291diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4 291diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4
292index bef6fa3..8841755 100644 292index 5853772..767fba2 100644
293--- a/libtextstyle/gnulib-local/m4/libglib.m4 293--- a/libtextstyle/gnulib-local/m4/libglib.m4
294+++ b/libtextstyle/gnulib-local/m4/libglib.m4 294+++ b/libtextstyle/gnulib-local/m4/libglib.m4
295@@ -1,105 +1,31 @@ 295@@ -6,100 +6,26 @@ dnl with or without modifications, as long as this notice is preserved.
296-# libglib.m4 serial 4
297-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc.
298+# libglib.m4 serial 3 (gettext-0.17)
299+dnl Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
300 dnl This file is free software; the Free Software Foundation
301 dnl gives unlimited permission to copy and/or distribute it,
302 dnl with or without modifications, as long as this notice is preserved.
303 296
304 dnl From Bruno Haible. 297 dnl From Bruno Haible.
305 298
@@ -535,17 +528,10 @@ index bc53cc6..10b2455 100644
535 AC_SUBST([LTLIBCROCO]) 528 AC_SUBST([LTLIBCROCO])
536 AC_SUBST([INCCROCO]) 529 AC_SUBST([INCCROCO])
537diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4 530diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4
538index bef6fa3..8841755 100644 531index 5853772..767fba2 100644
539--- a/libtextstyle/gnulib-m4/libglib.m4 532--- a/libtextstyle/gnulib-m4/libglib.m4
540+++ b/libtextstyle/gnulib-m4/libglib.m4 533+++ b/libtextstyle/gnulib-m4/libglib.m4
541@@ -1,105 +1,31 @@ 534@@ -6,100 +6,26 @@ dnl with or without modifications, as long as this notice is preserved.
542-# libglib.m4 serial 4
543-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc.
544+# libglib.m4 serial 3 (gettext-0.17)
545+dnl Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
546 dnl This file is free software; the Free Software Foundation
547 dnl gives unlimited permission to copy and/or distribute it,
548 dnl with or without modifications, as long as this notice is preserved.
549 535
550 dnl From Bruno Haible. 536 dnl From Bruno Haible.
551 537
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING b/meta/recipes-core/gettext/gettext-minimal-0.20.2/COPYING
index 3671ab6985..3671ab6985 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/COPYING
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/Makefile.in.in b/meta/recipes-core/gettext/gettext-minimal-0.20.2/Makefile.in.in
index fdb6ad3588..de980e040a 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/Makefile.in.in
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/Makefile.in.in
@@ -1,13 +1,13 @@
1# Makefile for PO directory in any package using GNU gettext. 1# Makefile for PO directory in any package using GNU gettext.
2# Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu> 2# Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu>
3# Copyright (C) 2000-2019 Free Software Foundation, Inc. 3# Copyright (C) 2000-2020 Free Software Foundation, Inc.
4# 4#
5# Copying and distribution of this file, with or without modification, 5# Copying and distribution of this file, with or without modification,
6# are permitted in any medium without royalty provided the copyright 6# are permitted in any medium without royalty provided the copyright
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 10# Origin: gettext-0.20.2
11GETTEXT_MACRO_VERSION = 0.20 11GETTEXT_MACRO_VERSION = 0.20
12 12
13PACKAGE = @PACKAGE@ 13PACKAGE = @PACKAGE@
@@ -90,6 +90,9 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
90 90
91# Makevars gets inserted here. (Don't remove this line!) 91# Makevars gets inserted here. (Don't remove this line!)
92 92
93all: all-@USE_NLS@
94
95
93.SUFFIXES: 96.SUFFIXES:
94.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update 97.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update
95 98
@@ -107,7 +110,8 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
107# the .pot file. This eliminates the need to update the .po files when the 110# the .pot file. This eliminates the need to update the .po files when the
108# .pot file has changed, which would be troublesome if the .po files are put 111# .pot file has changed, which would be troublesome if the .po files are put
109# under version control. 112# under version control.
110.po.gmo: $(srcdir)/$(DOMAIN).pot 113$(GMOFILES): $(srcdir)/$(DOMAIN).pot
114.po.gmo:
111 @lang=`echo $* | sed -e 's,.*/,,'`; \ 115 @lang=`echo $* | sed -e 's,.*/,,'`; \
112 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ 116 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
113 echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \ 117 echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
@@ -123,8 +127,6 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
123 mv t-$@ $@ 127 mv t-$@ $@
124 128
125 129
126all: all-@USE_NLS@
127
128all-yes: $(srcdir)/stamp-po 130all-yes: $(srcdir)/stamp-po
129all-no: 131all-no:
130 132
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/gettext.m4
index e7832418ea..4f25a27d93 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/gettext.m4
@@ -1,15 +1,15 @@
1# gettext.m4 serial 70 (gettext-0.20) 1# gettext.m4 serial 71 (gettext-0.20.2)
2dnl Copyright (C) 1995-2014, 2016, 2018 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
6dnl 6dnl
7dnl This file can be used in projects which are not available under 7dnl This file can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Lesser General Public
9dnl License but which still want to provide support for the GNU gettext 9dnl License but which still want to provide support for the GNU gettext
10dnl functionality. 10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered 11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Library General Public License, and the rest of the GNU 12dnl by the GNU Lesser General Public License, and the rest of the GNU
13dnl gettext package is covered by the GNU General Public License. 13dnl gettext package is covered by the GNU General Public License.
14dnl They are *not* in the public domain. 14dnl They are *not* in the public domain.
15 15
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/host-cpu-c-abi.m4
index 4407296d08..6db2aa25ae 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/host-cpu-c-abi.m4
@@ -1,5 +1,5 @@
1# host-cpu-c-abi.m4 serial 11 1# host-cpu-c-abi.m4 serial 13
2dnl Copyright (C) 2002-2019 Free Software Foundation, Inc. 2dnl Copyright (C) 2002-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
@@ -55,7 +55,7 @@ AC_DEFUN([gl_HOST_CPU_C_ABI],
55 [case "$host_cpu" in 55 [case "$host_cpu" in
56 56
57changequote(,)dnl 57changequote(,)dnl
58 i[4567]86 ) 58 i[34567]86 )
59changequote([,])dnl 59changequote([,])dnl
60 gl_cv_host_cpu_c_abi=i386 60 gl_cv_host_cpu_c_abi=i386
61 ;; 61 ;;
@@ -457,7 +457,8 @@ EOF
457 457
458 458
459dnl Sets the HOST_CPU_C_ABI_32BIT variable to 'yes' if the C language ABI 459dnl Sets the HOST_CPU_C_ABI_32BIT variable to 'yes' if the C language ABI
460dnl (application binary interface) is a 32-bit one, or to 'no' otherwise. 460dnl (application binary interface) is a 32-bit one, to 'no' if it is a 64-bit
461dnl one, or to 'unknown' if unknown.
461dnl This is a simplified variant of gl_HOST_CPU_C_ABI. 462dnl This is a simplified variant of gl_HOST_CPU_C_ABI.
462AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT], 463AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
463[ 464[
@@ -467,14 +468,44 @@ AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
467 case "$gl_cv_host_cpu_c_abi" in 468 case "$gl_cv_host_cpu_c_abi" in
468 i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) 469 i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
469 gl_cv_host_cpu_c_abi_32bit=yes ;; 470 gl_cv_host_cpu_c_abi_32bit=yes ;;
470 *) 471 x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
471 gl_cv_host_cpu_c_abi_32bit=no ;; 472 gl_cv_host_cpu_c_abi_32bit=no ;;
473 *)
474 gl_cv_host_cpu_c_abi_32bit=unknown ;;
472 esac 475 esac
473 else 476 else
474 case "$host_cpu" in 477 case "$host_cpu" in
475 478
479 # CPUs that only support a 32-bit ABI.
480 arc \
481 | bfin \
482 | cris* \
483 | csky \
484 | epiphany \
485 | ft32 \
486 | h8300 \
487 | m68k \
488 | microblaze | microblazeel \
489 | nds32 | nds32le | nds32be \
490 | nios2 | nios2eb | nios2el \
491 | or1k* \
492 | or32 \
493 | sh | sh[1234] | sh[1234]e[lb] \
494 | tic6x \
495 | xtensa* )
496 gl_cv_host_cpu_c_abi_32bit=yes
497 ;;
498
499 # CPUs that only support a 64-bit ABI.
476changequote(,)dnl 500changequote(,)dnl
477 i[4567]86 ) 501 alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
502 | mmix )
503changequote([,])dnl
504 gl_cv_host_cpu_c_abi_32bit=no
505 ;;
506
507changequote(,)dnl
508 i[34567]86 )
478changequote([,])dnl 509changequote([,])dnl
479 gl_cv_host_cpu_c_abi_32bit=yes 510 gl_cv_host_cpu_c_abi_32bit=yes
480 ;; 511 ;;
@@ -634,7 +665,7 @@ changequote([,])dnl
634 ;; 665 ;;
635 666
636 *) 667 *)
637 gl_cv_host_cpu_c_abi_32bit=no 668 gl_cv_host_cpu_c_abi_32bit=unknown
638 ;; 669 ;;
639 esac 670 esac
640 fi 671 fi
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/iconv.m4
index a285e9daa5..e593b7270a 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/iconv.m4
@@ -1,5 +1,5 @@
1# iconv.m4 serial 21 1# iconv.m4 serial 21
2dnl Copyright (C) 2000-2002, 2007-2014, 2016-2019 Free Software Foundation, 2dnl Copyright (C) 2000-2002, 2007-2014, 2016-2020 Free Software Foundation,
3dnl Inc. 3dnl Inc.
4dnl This file is free software; the Free Software Foundation 4dnl This file is free software; the Free Software Foundation
5dnl gives unlimited permission to copy and/or distribute it, 5dnl gives unlimited permission to copy and/or distribute it,
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/intlmacosx.m4
index 30e6f50e0a..ebd9937c1a 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/intlmacosx.m4
@@ -1,15 +1,15 @@
1# intlmacosx.m4 serial 6 (gettext-0.20) 1# intlmacosx.m4 serial 8 (gettext-0.20.2)
2dnl Copyright (C) 2004-2014, 2016, 2019 Free Software Foundation, Inc. 2dnl Copyright (C) 2004-2014, 2016, 2019-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
6dnl 6dnl
7dnl This file can be used in projects which are not available under 7dnl This file can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Lesser General Public
9dnl License but which still want to provide support for the GNU gettext 9dnl License but which still want to provide support for the GNU gettext
10dnl functionality. 10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered 11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Library General Public License, and the rest of the GNU 12dnl by the GNU Lesser General Public License, and the rest of the GNU
13dnl gettext package is covered by the GNU General Public License. 13dnl gettext package is covered by the GNU General Public License.
14dnl They are *not* in the public domain. 14dnl They are *not* in the public domain.
15 15
@@ -33,21 +33,15 @@ AC_DEFUN([gt_INTL_MACOSX],
33 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], 33 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
34 [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) 34 [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
35 fi 35 fi
36 dnl Check for API introduced in Mac OS X 10.5. 36 dnl Don't check for the API introduced in Mac OS X 10.5, CFLocaleCopyCurrent,
37 AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], 37 dnl because in macOS 10.13.4 it has the following behaviour:
38 [gt_save_LIBS="$LIBS" 38 dnl When two or more languages are specified in the
39 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" 39 dnl "System Preferences > Language & Region > Preferred Languages" panel,
40 AC_LINK_IFELSE( 40 dnl it returns en_CC where CC is the territory (even when English is not among
41 [AC_LANG_PROGRAM( 41 dnl the preferred languages!). What we want instead is what
42 [[#include <CoreFoundation/CFLocale.h>]], 42 dnl CFLocaleCopyCurrent returned in earlier macOS releases and what
43 [[CFLocaleCopyCurrent();]])], 43 dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the
44 [gt_cv_func_CFLocaleCopyCurrent=yes], 44 dnl first among the preferred languages and CC is the territory.
45 [gt_cv_func_CFLocaleCopyCurrent=no])
46 LIBS="$gt_save_LIBS"])
47 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
48 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
49 [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
50 fi
51 AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages], 45 AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
52 [gt_save_LIBS="$LIBS" 46 [gt_save_LIBS="$LIBS"
53 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" 47 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
@@ -64,7 +58,6 @@ AC_DEFUN([gt_INTL_MACOSX],
64 fi 58 fi
65 INTL_MACOSX_LIBS= 59 INTL_MACOSX_LIBS=
66 if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ 60 if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
67 || test $gt_cv_func_CFLocaleCopyCurrent = yes \
68 || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then 61 || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
69 INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" 62 INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
70 fi 63 fi
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-ld.m4
index a18719630d..98c348faff 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-ld.m4
@@ -1,5 +1,5 @@
1# lib-ld.m4 serial 9 1# lib-ld.m4 serial 9
2dnl Copyright (C) 1996-2003, 2009-2019 Free Software Foundation, Inc. 2dnl Copyright (C) 1996-2003, 2009-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-link.m4
index 0ff10731fa..eecf70ec76 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-link.m4
@@ -1,5 +1,5 @@
1# lib-link.m4 serial 28 1# lib-link.m4 serial 31
2dnl Copyright (C) 2001-2019 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
@@ -192,6 +192,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
192 AC_LIB_WITH_FINAL_PREFIX([ 192 AC_LIB_WITH_FINAL_PREFIX([
193 eval additional_includedir=\"$includedir\" 193 eval additional_includedir=\"$includedir\"
194 eval additional_libdir=\"$libdir\" 194 eval additional_libdir=\"$libdir\"
195 eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
196 eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
195 ]) 197 ])
196 AC_ARG_WITH(PACK[-prefix], 198 AC_ARG_WITH(PACK[-prefix],
197[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib 199[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
@@ -204,17 +206,23 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
204 AC_LIB_WITH_FINAL_PREFIX([ 206 AC_LIB_WITH_FINAL_PREFIX([
205 eval additional_includedir=\"$includedir\" 207 eval additional_includedir=\"$includedir\"
206 eval additional_libdir=\"$libdir\" 208 eval additional_libdir=\"$libdir\"
209 eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
210 eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
207 ]) 211 ])
208 else 212 else
209 additional_includedir="$withval/include" 213 additional_includedir="$withval/include"
210 additional_libdir="$withval/$acl_libdirstem" 214 additional_libdir="$withval/$acl_libdirstem"
211 if test "$acl_libdirstem2" != "$acl_libdirstem" \ 215 additional_libdir2="$withval/$acl_libdirstem2"
212 && test ! -d "$withval/$acl_libdirstem"; then 216 additional_libdir3="$withval/$acl_libdirstem3"
213 additional_libdir="$withval/$acl_libdirstem2"
214 fi
215 fi 217 fi
216 fi 218 fi
217]) 219])
220 if test "X$additional_libdir2" = "X$additional_libdir"; then
221 additional_libdir2=
222 fi
223 if test "X$additional_libdir3" = "X$additional_libdir"; then
224 additional_libdir3=
225 fi
218 dnl Search the library and its dependencies in $additional_libdir and 226 dnl Search the library and its dependencies in $additional_libdir and
219 dnl $LDFLAGS. Using breadth-first-seach. 227 dnl $LDFLAGS. Using breadth-first-seach.
220 LIB[]NAME= 228 LIB[]NAME=
@@ -270,48 +278,54 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
270 shrext= 278 shrext=
271 fi 279 fi
272 if test $use_additional = yes; then 280 if test $use_additional = yes; then
273 dir="$additional_libdir" 281 for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do
274 dnl The same code as in the loop below: 282 if test "X$found_dir" = "X"; then
275 dnl First look for a shared library. 283 eval dir=\$$additional_libdir_variable
276 if test -n "$acl_shlibext"; then 284 if test -n "$dir"; then
277 if test -f "$dir/$libname$shrext"; then 285 dnl The same code as in the loop below:
278 found_dir="$dir" 286 dnl First look for a shared library.
279 found_so="$dir/$libname$shrext" 287 if test -n "$acl_shlibext"; then
280 else 288 if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
281 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then 289 found_dir="$dir"
282 ver=`(cd "$dir" && \ 290 found_so="$dir/$libname$shrext"
283 for f in "$libname$shrext".*; do echo "$f"; done \ 291 else
284 | sed -e "s,^$libname$shrext\\\\.,," \ 292 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
285 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ 293 ver=`(cd "$dir" && \
286 | sed 1q ) 2>/dev/null` 294 for f in "$libname$shrext".*; do echo "$f"; done \
287 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then 295 | sed -e "s,^$libname$shrext\\\\.,," \
288 found_dir="$dir" 296 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
289 found_so="$dir/$libname$shrext.$ver" 297 | sed 1q ) 2>/dev/null`
298 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
299 found_dir="$dir"
300 found_so="$dir/$libname$shrext.$ver"
301 fi
302 else
303 eval library_names=\"$acl_library_names_spec\"
304 for f in $library_names; do
305 if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
306 found_dir="$dir"
307 found_so="$dir/$f"
308 break
309 fi
310 done
311 fi
312 fi
290 fi 313 fi
291 else 314 dnl Then look for a static library.
292 eval library_names=\"$acl_library_names_spec\" 315 if test "X$found_dir" = "X"; then
293 for f in $library_names; do 316 if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
294 if test -f "$dir/$f"; then
295 found_dir="$dir" 317 found_dir="$dir"
296 found_so="$dir/$f" 318 found_a="$dir/$libname.$acl_libext"
297 break
298 fi 319 fi
299 done 320 fi
321 if test "X$found_dir" != "X"; then
322 if test -f "$dir/$libname.la"; then
323 found_la="$dir/$libname.la"
324 fi
325 fi
300 fi 326 fi
301 fi 327 fi
302 fi 328 done
303 dnl Then look for a static library.
304 if test "X$found_dir" = "X"; then
305 if test -f "$dir/$libname.$acl_libext"; then
306 found_dir="$dir"
307 found_a="$dir/$libname.$acl_libext"
308 fi
309 fi
310 if test "X$found_dir" != "X"; then
311 if test -f "$dir/$libname.la"; then
312 found_la="$dir/$libname.la"
313 fi
314 fi
315 fi 329 fi
316 if test "X$found_dir" = "X"; then 330 if test "X$found_dir" = "X"; then
317 for x in $LDFLAGS $LTLIB[]NAME; do 331 for x in $LDFLAGS $LTLIB[]NAME; do
@@ -321,7 +335,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
321 dir=`echo "X$x" | sed -e 's/^X-L//'` 335 dir=`echo "X$x" | sed -e 's/^X-L//'`
322 dnl First look for a shared library. 336 dnl First look for a shared library.
323 if test -n "$acl_shlibext"; then 337 if test -n "$acl_shlibext"; then
324 if test -f "$dir/$libname$shrext"; then 338 if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
325 found_dir="$dir" 339 found_dir="$dir"
326 found_so="$dir/$libname$shrext" 340 found_so="$dir/$libname$shrext"
327 else 341 else
@@ -331,14 +345,14 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
331 | sed -e "s,^$libname$shrext\\\\.,," \ 345 | sed -e "s,^$libname$shrext\\\\.,," \
332 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ 346 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
333 | sed 1q ) 2>/dev/null` 347 | sed 1q ) 2>/dev/null`
334 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then 348 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
335 found_dir="$dir" 349 found_dir="$dir"
336 found_so="$dir/$libname$shrext.$ver" 350 found_so="$dir/$libname$shrext.$ver"
337 fi 351 fi
338 else 352 else
339 eval library_names=\"$acl_library_names_spec\" 353 eval library_names=\"$acl_library_names_spec\"
340 for f in $library_names; do 354 for f in $library_names; do
341 if test -f "$dir/$f"; then 355 if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
342 found_dir="$dir" 356 found_dir="$dir"
343 found_so="$dir/$f" 357 found_so="$dir/$f"
344 break 358 break
@@ -349,7 +363,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
349 fi 363 fi
350 dnl Then look for a static library. 364 dnl Then look for a static library.
351 if test "X$found_dir" = "X"; then 365 if test "X$found_dir" = "X"; then
352 if test -f "$dir/$libname.$acl_libext"; then 366 if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
353 found_dir="$dir" 367 found_dir="$dir"
354 found_a="$dir/$libname.$acl_libext" 368 found_a="$dir/$libname.$acl_libext"
355 fi 369 fi
@@ -375,7 +389,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
375 dnl standard /usr/lib. 389 dnl standard /usr/lib.
376 if test "$enable_rpath" = no \ 390 if test "$enable_rpath" = no \
377 || test "X$found_dir" = "X/usr/$acl_libdirstem" \ 391 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
378 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then 392 || test "X$found_dir" = "X/usr/$acl_libdirstem2" \
393 || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
379 dnl No hardcoding is needed. 394 dnl No hardcoding is needed.
380 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" 395 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
381 else 396 else
@@ -475,6 +490,13 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
475 fi 490 fi
476 additional_includedir="$basedir/include" 491 additional_includedir="$basedir/include"
477 ;; 492 ;;
493 */$acl_libdirstem3 | */$acl_libdirstem3/)
494 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'`
495 if test "$name" = '$1'; then
496 LIB[]NAME[]_PREFIX="$basedir"
497 fi
498 additional_includedir="$basedir/include"
499 ;;
478 esac 500 esac
479 if test "X$additional_includedir" != "X"; then 501 if test "X$additional_includedir" != "X"; then
480 dnl Potentially add $additional_includedir to $INCNAME. 502 dnl Potentially add $additional_includedir to $INCNAME.
@@ -525,19 +547,21 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
525 for dep in $dependency_libs; do 547 for dep in $dependency_libs; do
526 case "$dep" in 548 case "$dep" in
527 -L*) 549 -L*)
528 additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` 550 dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
529 dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. 551 dnl Potentially add $dependency_libdir to $LIBNAME and $LTLIBNAME.
530 dnl But don't add it 552 dnl But don't add it
531 dnl 1. if it's the standard /usr/lib, 553 dnl 1. if it's the standard /usr/lib,
532 dnl 2. if it's /usr/local/lib and we are using GCC on Linux, 554 dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
533 dnl 3. if it's already present in $LDFLAGS or the already 555 dnl 3. if it's already present in $LDFLAGS or the already
534 dnl constructed $LIBNAME, 556 dnl constructed $LIBNAME,
535 dnl 4. if it doesn't exist as a directory. 557 dnl 4. if it doesn't exist as a directory.
536 if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ 558 if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \
537 && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then 559 && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \
560 && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then
538 haveit= 561 haveit=
539 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ 562 if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \
540 || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then 563 || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \
564 || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then
541 if test -n "$GCC"; then 565 if test -n "$GCC"; then
542 case $host_os in 566 case $host_os in
543 linux* | gnu* | k*bsd*-gnu) haveit=yes;; 567 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -548,29 +572,29 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
548 haveit= 572 haveit=
549 for x in $LDFLAGS $LIB[]NAME; do 573 for x in $LDFLAGS $LIB[]NAME; do
550 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) 574 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
551 if test "X$x" = "X-L$additional_libdir"; then 575 if test "X$x" = "X-L$dependency_libdir"; then
552 haveit=yes 576 haveit=yes
553 break 577 break
554 fi 578 fi
555 done 579 done
556 if test -z "$haveit"; then 580 if test -z "$haveit"; then
557 if test -d "$additional_libdir"; then 581 if test -d "$dependency_libdir"; then
558 dnl Really add $additional_libdir to $LIBNAME. 582 dnl Really add $dependency_libdir to $LIBNAME.
559 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" 583 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$dependency_libdir"
560 fi 584 fi
561 fi 585 fi
562 haveit= 586 haveit=
563 for x in $LDFLAGS $LTLIB[]NAME; do 587 for x in $LDFLAGS $LTLIB[]NAME; do
564 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) 588 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
565 if test "X$x" = "X-L$additional_libdir"; then 589 if test "X$x" = "X-L$dependency_libdir"; then
566 haveit=yes 590 haveit=yes
567 break 591 break
568 fi 592 fi
569 done 593 done
570 if test -z "$haveit"; then 594 if test -z "$haveit"; then
571 if test -d "$additional_libdir"; then 595 if test -d "$dependency_libdir"; then
572 dnl Really add $additional_libdir to $LTLIBNAME. 596 dnl Really add $dependency_libdir to $LTLIBNAME.
573 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" 597 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$dependency_libdir"
574 fi 598 fi
575 fi 599 fi
576 fi 600 fi
@@ -718,7 +742,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
718 dir="$next" 742 dir="$next"
719 dnl No need to hardcode the standard /usr/lib. 743 dnl No need to hardcode the standard /usr/lib.
720 if test "X$dir" != "X/usr/$acl_libdirstem" \ 744 if test "X$dir" != "X/usr/$acl_libdirstem" \
721 && test "X$dir" != "X/usr/$acl_libdirstem2"; then 745 && test "X$dir" != "X/usr/$acl_libdirstem2" \
746 && test "X$dir" != "X/usr/$acl_libdirstem3"; then
722 rpathdirs="$rpathdirs $dir" 747 rpathdirs="$rpathdirs $dir"
723 fi 748 fi
724 next= 749 next=
@@ -728,7 +753,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
728 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` 753 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
729 dnl No need to hardcode the standard /usr/lib. 754 dnl No need to hardcode the standard /usr/lib.
730 if test "X$dir" != "X/usr/$acl_libdirstem" \ 755 if test "X$dir" != "X/usr/$acl_libdirstem" \
731 && test "X$dir" != "X/usr/$acl_libdirstem2"; then 756 && test "X$dir" != "X/usr/$acl_libdirstem2" \
757 && test "X$dir" != "X/usr/$acl_libdirstem3"; then
732 rpathdirs="$rpathdirs $dir" 758 rpathdirs="$rpathdirs $dir"
733 fi 759 fi
734 next= ;; 760 next= ;;
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-prefix.m4
index 8adb17bb91..c8a0b464c2 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-prefix.m4
@@ -1,5 +1,5 @@
1# lib-prefix.m4 serial 14 1# lib-prefix.m4 serial 17
2dnl Copyright (C) 2001-2005, 2008-2019 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2005, 2008-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
@@ -147,21 +147,24 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
147]) 147])
148 148
149dnl AC_LIB_PREPARE_MULTILIB creates 149dnl AC_LIB_PREPARE_MULTILIB creates
150dnl - a variable acl_libdirstem, containing the basename of the libdir, either 150dnl - a function acl_is_expected_elfclass, that tests whether standard input
151dnl "lib" or "lib64" or "lib/64", 151dn; has a 32-bit or 64-bit ELF header, depending on the host CPU ABI,
152dnl - a variable acl_libdirstem2, as a secondary possible value for 152dnl - 3 variables acl_libdirstem, acl_libdirstem2, acl_libdirstem3, containing
153dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or 153dnl the basename of the libdir to try in turn, either "lib" or "lib64" or
154dnl "lib/amd64". 154dnl "lib/64" or "lib32" or "lib/sparcv9" or "lib/amd64" or similar.
155AC_DEFUN([AC_LIB_PREPARE_MULTILIB], 155AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
156[ 156[
157 dnl There is no formal standard regarding lib and lib64. 157 dnl There is no formal standard regarding lib, lib32, and lib64.
158 dnl On glibc systems, the current practice is that on a system supporting 158 dnl On most glibc systems, the current practice is that on a system supporting
159 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under 159 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
160 dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine 160 dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. However, on
161 dnl the compiler's default mode by looking at the compiler's library search 161 dnl Arch Linux based distributions, it's the opposite: 32-bit libraries go
162 dnl path. If at least one of its elements ends in /lib64 or points to a 162 dnl under $prefix/lib32 and 64-bit libraries go under $prefix/lib.
163 dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. 163 dnl We determine the compiler's default mode by looking at the compiler's
164 dnl Otherwise we use the default, namely "lib". 164 dnl library search path. If at least one of its elements ends in /lib64 or
165 dnl points to a directory whose absolute pathname ends in /lib64, we use that
166 dnl for 64-bit ABIs. Similarly for 32-bit ABIs. Otherwise we use the default,
167 dnl namely "lib".
165 dnl On Solaris systems, the current practice is that on a system supporting 168 dnl On Solaris systems, the current practice is that on a system supporting
166 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under 169 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
167 dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or 170 dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
@@ -169,27 +172,72 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
169 AC_REQUIRE([AC_CANONICAL_HOST]) 172 AC_REQUIRE([AC_CANONICAL_HOST])
170 AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT]) 173 AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT])
171 174
172 case "$host_os" in 175 AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf],
173 solaris*) 176 [AC_EGREP_CPP([Extensible Linking Format],
174 AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], 177 [#ifdef __ELF__
175 [AC_COMPILE_IFELSE( 178 Extensible Linking Format
176 [AC_LANG_SOURCE( 179 #endif
177 [[#ifdef _LP64 180 ],
178 int ok; 181 [gl_cv_elf=yes],
179 #else 182 [gl_cv_elf=no])
180 error fail 183 ])
181 #endif 184 if test $gl_cv_elf; then
182 ]])], 185 # Extract the ELF class of a file (5th byte) in decimal.
183 [gl_cv_solaris_64bit=yes], 186 # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
184 [gl_cv_solaris_64bit=no]) 187 if od -A x < /dev/null >/dev/null 2>/dev/null; then
185 ]);; 188 # Use POSIX od.
186 esac 189 func_elfclass ()
190 {
191 od -A n -t d1 -j 4 -N 1
192 }
193 else
194 # Use BSD hexdump.
195 func_elfclass ()
196 {
197 dd bs=1 count=1 skip=4 2>/dev/null | hexdump -e '1/1 "%3d "'
198 echo
199 }
200 fi
201changequote(,)dnl
202 case $HOST_CPU_C_ABI_32BIT in
203 yes)
204 # 32-bit ABI.
205 acl_is_expected_elfclass ()
206 {
207 test "`func_elfclass | sed -e 's/[ ]//g'`" = 1
208 }
209 ;;
210 no)
211 # 64-bit ABI.
212 acl_is_expected_elfclass ()
213 {
214 test "`func_elfclass | sed -e 's/[ ]//g'`" = 2
215 }
216 ;;
217 *)
218 # Unknown.
219 acl_is_expected_elfclass ()
220 {
221 :
222 }
223 ;;
224 esac
225changequote([,])dnl
226 else
227 acl_is_expected_elfclass ()
228 {
229 :
230 }
231 fi
187 232
188 dnl Allow the user to override the result by setting acl_cv_libdirstems. 233 dnl Allow the user to override the result by setting acl_cv_libdirstems.
189 AC_CACHE_CHECK([for the common suffixes of directories in the library search path], 234 AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
190 [acl_cv_libdirstems], 235 [acl_cv_libdirstems],
191 [acl_libdirstem=lib 236 [dnl Try 'lib' first, because that's the default for libdir in GNU, see
237 dnl <https://www.gnu.org/prep/standards/html_node/Directory-Variables.html>.
238 acl_libdirstem=lib
192 acl_libdirstem2= 239 acl_libdirstem2=
240 acl_libdirstem3=
193 case "$host_os" in 241 case "$host_os" in
194 solaris*) 242 solaris*)
195 dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment 243 dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
@@ -197,53 +245,76 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
197 dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." 245 dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
198 dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the 246 dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
199 dnl symlink is missing, so we set acl_libdirstem2 too. 247 dnl symlink is missing, so we set acl_libdirstem2 too.
200 if test $gl_cv_solaris_64bit = yes; then 248 if test $HOST_CPU_C_ABI_32BIT = no; then
201 acl_libdirstem=lib/64 249 acl_libdirstem2=lib/64
202 case "$host_cpu" in 250 case "$host_cpu" in
203 sparc*) acl_libdirstem2=lib/sparcv9 ;; 251 sparc*) acl_libdirstem3=lib/sparcv9 ;;
204 i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; 252 i*86 | x86_64) acl_libdirstem3=lib/amd64 ;;
205 esac 253 esac
206 fi 254 fi
207 ;; 255 ;;
208 *) 256 *)
209 dnl If $CC generates code for a 32-bit ABI, the libraries are 257 dnl If $CC generates code for a 32-bit ABI, the libraries are
210 dnl surely under $prefix/lib, not $prefix/lib64. 258 dnl surely under $prefix/lib or $prefix/lib32, not $prefix/lib64.
211 if test "$HOST_CPU_C_ABI_32BIT" != yes; then 259 dnl Similarly, if $CC generates code for a 64-bit ABI, the libraries
212 dnl The result is a property of the system. However, non-system 260 dnl are surely under $prefix/lib or $prefix/lib64, not $prefix/lib32.
213 dnl compilers sometimes have odd library search paths. Therefore 261 dnl Find the compiler's search path. However, non-system compilers
214 dnl prefer asking /usr/bin/gcc, if available, rather than $CC. 262 dnl sometimes have odd library search paths. But we can't simply invoke
215 searchpath=`(if test -f /usr/bin/gcc \ 263 dnl '/usr/bin/gcc -print-search-dirs' because that would not take into
216 && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \ 264 dnl account the -m32/-m31 or -m64 options from the $CC or $CFLAGS.
217 LC_ALL=C /usr/bin/gcc -print-search-dirs; \ 265 searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \
218 else \ 266 | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
219 LC_ALL=C $CC -print-search-dirs; \ 267 if test $HOST_CPU_C_ABI_32BIT != no; then
220 fi) 2>/dev/null \ 268 # 32-bit or unknown ABI.
221 | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` 269 if test -d /usr/lib32; then
222 if test -n "$searchpath"; then 270 acl_libdirstem2=lib32
223 acl_save_IFS="${IFS= }"; IFS=":" 271 fi
224 for searchdir in $searchpath; do 272 fi
225 if test -d "$searchdir"; then 273 if test $HOST_CPU_C_ABI_32BIT != yes; then
226 case "$searchdir" in 274 # 64-bit or unknown ABI.
227 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; 275 if test -d /usr/lib64; then
228 */../ | */.. ) 276 acl_libdirstem3=lib64
229 # Better ignore directories of this form. They are misleading. 277 fi
230 ;; 278 fi
231 *) searchdir=`cd "$searchdir" && pwd` 279 if test -n "$searchpath"; then
232 case "$searchdir" in 280 acl_save_IFS="${IFS= }"; IFS=":"
233 */lib64 ) acl_libdirstem=lib64 ;; 281 for searchdir in $searchpath; do
234 esac ;; 282 if test -d "$searchdir"; then
235 esac 283 case "$searchdir" in
236 fi 284 */lib32/ | */lib32 ) acl_libdirstem2=lib32 ;;
237 done 285 */lib64/ | */lib64 ) acl_libdirstem3=lib64 ;;
238 IFS="$acl_save_IFS" 286 */../ | */.. )
287 # Better ignore directories of this form. They are misleading.
288 ;;
289 *) searchdir=`cd "$searchdir" && pwd`
290 case "$searchdir" in
291 */lib32 ) acl_libdirstem2=lib32 ;;
292 */lib64 ) acl_libdirstem3=lib64 ;;
293 esac ;;
294 esac
295 fi
296 done
297 IFS="$acl_save_IFS"
298 if test $HOST_CPU_C_ABI_32BIT = yes; then
299 # 32-bit ABI.
300 acl_libdirstem3=
301 fi
302 if test $HOST_CPU_C_ABI_32BIT = no; then
303 # 64-bit ABI.
304 acl_libdirstem2=
239 fi 305 fi
240 fi 306 fi
241 ;; 307 ;;
242 esac 308 esac
243 test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" 309 test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
244 acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2" 310 test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem"
311 acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3"
245 ]) 312 ])
246 # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2. 313 dnl Decompose acl_cv_libdirstems into acl_libdirstem, acl_libdirstem2, and
314 dnl acl_libdirstem3.
315changequote(,)dnl
247 acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'` 316 acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
248 acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'` 317 acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
318 acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
319changequote([,])dnl
249]) 320])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/nls.m4
index b62f614857..5a506fc4b5 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/nls.m4
@@ -1,16 +1,16 @@
1# nls.m4 serial 5 (gettext-0.18) 1# nls.m4 serial 6 (gettext-0.20.2)
2dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019 Free Software 2dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2020 Free
3dnl Foundation, Inc. 3dnl Software Foundation, Inc.
4dnl This file is free software; the Free Software Foundation 4dnl This file is free software; the Free Software Foundation
5dnl gives unlimited permission to copy and/or distribute it, 5dnl gives unlimited permission to copy and/or distribute it,
6dnl with or without modifications, as long as this notice is preserved. 6dnl with or without modifications, as long as this notice is preserved.
7dnl 7dnl
8dnl This file can be used in projects which are not available under 8dnl This file can be used in projects which are not available under
9dnl the GNU General Public License or the GNU Library General Public 9dnl the GNU General Public License or the GNU Lesser General Public
10dnl License but which still want to provide support for the GNU gettext 10dnl License but which still want to provide support for the GNU gettext
11dnl functionality. 11dnl functionality.
12dnl Please note that the actual code of the GNU gettext library is covered 12dnl Please note that the actual code of the GNU gettext library is covered
13dnl by the GNU Library General Public License, and the rest of the GNU 13dnl by the GNU Lesser General Public License, and the rest of the GNU
14dnl gettext package is covered by the GNU General Public License. 14dnl gettext package is covered by the GNU General Public License.
15dnl They are *not* in the public domain. 15dnl They are *not* in the public domain.
16 16
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/po.m4
index 143792dba5..3778fd7aac 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/po.m4
@@ -1,15 +1,15 @@
1# po.m4 serial 30 (gettext-0.20) 1# po.m4 serial 31 (gettext-0.20.2)
2dnl Copyright (C) 1995-2014, 2016, 2018-2019 Free Software Foundation, Inc. 2dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
6dnl 6dnl
7dnl This file can be used in projects which are not available under 7dnl This file can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Lesser General Public
9dnl License but which still want to provide support for the GNU gettext 9dnl License but which still want to provide support for the GNU gettext
10dnl functionality. 10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered 11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Library General Public License, and the rest of the GNU 12dnl by the GNU Lesser General Public License, and the rest of the GNU
13dnl gettext package is covered by the GNU General Public License. 13dnl gettext package is covered by the GNU General Public License.
14dnl They are *not* in the public domain. 14dnl They are *not* in the public domain.
15 15
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/progtest.m4
index 5f186b1490..f28010aed1 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/progtest.m4
@@ -1,15 +1,15 @@
1# progtest.m4 serial 7 (gettext-0.18.2) 1# progtest.m4 serial 8 (gettext-0.20.2)
2dnl Copyright (C) 1996-2003, 2005, 2008-2019 Free Software Foundation, Inc. 2dnl Copyright (C) 1996-2003, 2005, 2008-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
6dnl 6dnl
7dnl This file can be used in projects which are not available under 7dnl This file can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Library General Public 8dnl the GNU General Public License or the GNU Lesser General Public
9dnl License but which still want to provide support for the GNU gettext 9dnl License but which still want to provide support for the GNU gettext
10dnl functionality. 10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered 11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Library General Public License, and the rest of the GNU 12dnl by the GNU Lesser General Public License, and the rest of the GNU
13dnl gettext package is covered by the GNU General Public License. 13dnl gettext package is covered by the GNU General Public License.
14dnl They are *not* in the public domain. 14dnl They are *not* in the public domain.
15 15
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath b/meta/recipes-core/gettext/gettext-minimal-0.20.2/config.rpath
index be202c1a9e..24be79cfb6 100755
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/config.rpath
@@ -2,7 +2,7 @@
2# Output a system dependent set of variables, describing how to set the 2# Output a system dependent set of variables, describing how to set the
3# run time search path of shared libraries in an executable. 3# run time search path of shared libraries in an executable.
4# 4#
5# Copyright 1996-2019 Free Software Foundation, Inc. 5# Copyright 1996-2020 Free Software Foundation, Inc.
6# Taken from GNU libtool, 2001 6# Taken from GNU libtool, 2001
7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
8# 8#
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.20.2/remove-potcdate.sin
index 8c70dfbf14..8c70dfbf14 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.2/remove-potcdate.sin
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.20.2.bb
index 7a4dcbec57..7a4dcbec57 100644
--- a/meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb
+++ b/meta/recipes-core/gettext/gettext-minimal-native_0.20.2.bb
diff --git a/meta/recipes-core/gettext/gettext_0.20.1.bb b/meta/recipes-core/gettext/gettext_0.20.2.bb
index 85493e7595..fda11c44cc 100644
--- a/meta/recipes-core/gettext/gettext_0.20.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.20.2.bb
@@ -19,16 +19,14 @@ RCONFLICTS_${PN} = "proxy-libintl"
19SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 19SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
20 file://parallel.patch \ 20 file://parallel.patch \
21 file://add-with-bisonlocaledir.patch \ 21 file://add-with-bisonlocaledir.patch \
22 file://cr-statement.c-timsort.h-fix-formatting-issues.patch \
23 file://use-pkgconfig.patch \ 22 file://use-pkgconfig.patch \
24 file://run-ptest \ 23 file://run-ptest \
25 file://serial-tests-config.patch \ 24 file://serial-tests-config.patch \
26 file://0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch \
27 file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ 25 file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \
28 file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ 26 file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \
29 " 27 "
30SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2" 28SRC_URI[md5sum] = "30fec34a895fab4c02584449c500aac2"
31SRC_URI[sha256sum] = "66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c" 29SRC_URI[sha256sum] = "ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1"
32 30
33inherit autotools texinfo pkgconfig ptest 31inherit autotools texinfo pkgconfig ptest
34 32
@@ -132,7 +130,7 @@ do_install_append_class-native () {
132 rm ${D}${datadir}/gettext/po/remove-potcdate.sin 130 rm ${D}${datadir}/gettext/po/remove-potcdate.sin
133 131
134 create_wrapper ${D}${bindir}/msgfmt \ 132 create_wrapper ${D}${bindir}/msgfmt \
135 GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.20/" 133 GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.20.2/"
136 134
137} 135}
138 136