diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-11-17 16:34:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-21 11:05:01 +0000 |
commit | fbc3830ecf6737d132c1aad03a90458bdeeb0ef6 (patch) | |
tree | ba3982a36a45d141df3868eacd1ce0190b26b505 /meta/recipes-support/libunistring | |
parent | b5c30fb196d95cdf2d452f5f0a7ee979f2f8f455 (diff) | |
download | poky-fbc3830ecf6737d132c1aad03a90458bdeeb0ef6.tar.gz |
libunistring: address automake 1.16.5 failures
(From OE-Core rev: fe0e7e4b626c70416a0e19f339cb5d52e16b9d2c)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libunistring')
-rw-r--r-- | meta/recipes-support/libunistring/libunistring/0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch | 57 | ||||
-rw-r--r-- | meta/recipes-support/libunistring/libunistring_0.9.10.bb | 1 |
2 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-support/libunistring/libunistring/0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch b/meta/recipes-support/libunistring/libunistring/0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch new file mode 100644 index 0000000000..d8424f28d4 --- /dev/null +++ b/meta/recipes-support/libunistring/libunistring/0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | From 15e4365267e316f15222b8bf9f0a7cd0db231e9c Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruno Haible <bruno@clisp.org> | ||
3 | Date: Sun, 8 Aug 2021 01:58:42 +0200 | ||
4 | Subject: [PATCH] Make gl_INIT_PACKAGE work with Automake >= 1.16.4. | ||
5 | |||
6 | Reported and analyzed by Nicole Mazzuca <mazzucan@outlook.com> in | ||
7 | <https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00002.html>. | ||
8 | |||
9 | * m4/init-package-version.m4 (gl_INIT_PACKAGE): Use a new macro | ||
10 | gl_INIT_EMPTY. | ||
11 | (gl_INIT_DUMMY): Expand to empty in two steps, via a new macro | ||
12 | gl_INIT_DUMMY2. | ||
13 | |||
14 | Upstream-Status: Backport | ||
15 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
16 | --- | ||
17 | ChangeLog | 10 ++++++++++ | ||
18 | m4/init-package-version.m4 | 12 ++++++++---- | ||
19 | 2 files changed, 18 insertions(+), 4 deletions(-) | ||
20 | |||
21 | diff --git a/m4/init-package-version.m4 b/m4/init-package-version.m4 | ||
22 | index f131a84..a26b1ab 100644 | ||
23 | --- a/m4/init-package-version.m4 | ||
24 | +++ b/m4/init-package-version.m4 | ||
25 | @@ -1,5 +1,5 @@ | ||
26 | -# init-package-version.m4 serial 1 (gettext-0.18) | ||
27 | -dnl Copyright (C) 1992-2009 Free Software Foundation, Inc. | ||
28 | +# init-package-version.m4 serial 2 | ||
29 | +dnl Copyright (C) 1992-2021 Free Software Foundation, Inc. | ||
30 | dnl This file is free software, distributed under the terms of the GNU | ||
31 | dnl General Public License. As a special exception to the GNU General | ||
32 | dnl Public License, this file may be distributed as part of a program | ||
33 | @@ -77,7 +77,7 @@ AC_DEFUN([gl_INIT_PACKAGE], | ||
34 | m4_bpatsubst(m4_dquote( | ||
35 | m4_defn([AM_INIT_AUTOMAKE])), | ||
36 | [AC_PACKAGE_NAME], [gl_INIT_DUMMY])), | ||
37 | - [AC_PACKAGE_TARNAME], [gl_INIT_DUMMY])), | ||
38 | + [AC_PACKAGE_TARNAME], [gl_INIT_EMPTY])), | ||
39 | [AC_PACKAGE_VERSION], [gl_INIT_DUMMY]) | ||
40 | [AC_SUBST([PACKAGE], [$1]) | ||
41 | AC_SUBST([VERSION], [$2]) | ||
42 | @@ -85,7 +85,11 @@ AC_DEFUN([gl_INIT_PACKAGE], | ||
43 | m4_define([AM_INIT_AUTOMAKE], | ||
44 | m4_defn([gl_RPL_INIT_AUTOMAKE])) | ||
45 | ]) | ||
46 | -m4_define([gl_INIT_DUMMY], []) | ||
47 | +m4_define([gl_INIT_EMPTY], []) | ||
48 | +dnl Automake 1.16.4 no longer accepts an empty value for gl_INIT_DUMMY. | ||
49 | +dnl But a macro that later expands to empty works. | ||
50 | +m4_define([gl_INIT_DUMMY], [gl_INIT_DUMMY2]) | ||
51 | +m4_define([gl_INIT_DUMMY2], []) | ||
52 | AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [ | ||
53 | m4_ifval([$2], | ||
54 | [m4_fatal([After gl_INIT_PACKAGE, the two-argument form of AM_INIT_AUTOMAKE cannot be used.])]) | ||
55 | -- | ||
56 | 2.20.1 | ||
57 | |||
diff --git a/meta/recipes-support/libunistring/libunistring_0.9.10.bb b/meta/recipes-support/libunistring/libunistring_0.9.10.bb index 589faacb05..0692bbcb44 100644 --- a/meta/recipes-support/libunistring/libunistring_0.9.10.bb +++ b/meta/recipes-support/libunistring/libunistring_0.9.10.bb | |||
@@ -22,6 +22,7 @@ DEPENDS = "gperf-native" | |||
22 | 22 | ||
23 | SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ | 23 | SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ |
24 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ | 24 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ |
25 | file://0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch \ | ||
25 | " | 26 | " |
26 | SRC_URI[md5sum] = "0d3274e9838396b12200f8b54ddaf43b" | 27 | SRC_URI[md5sum] = "0d3274e9838396b12200f8b54ddaf43b" |
27 | SRC_URI[sha256sum] = "a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b" | 28 | SRC_URI[sha256sum] = "a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b" |