From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 04/18] lrzsz: fix issues with newer versions of gettext
Date: Mon, 2 Dec 2019 18:54:45 +0100 [thread overview]
Message-ID: <20191202175459.112655-4-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20191202175459.112655-1-alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...-issues-with-recent-gettext-versions.patch | 42 +++++++++++++++++++
meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb | 11 ++---
2 files changed, 48 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/0009-Fix-issues-with-recent-gettext-versions.patch
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/0009-Fix-issues-with-recent-gettext-versions.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/0009-Fix-issues-with-recent-gettext-versions.patch
new file mode 100644
index 00000000000..c8a05f3818b
--- /dev/null
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/0009-Fix-issues-with-recent-gettext-versions.patch
@@ -0,0 +1,42 @@
+From 245c104267363c13f2ba83eca4409c673ee99fcf Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 21 Nov 2019 12:34:56 +0100
+Subject: [PATCH] Fix issues with recent gettext versions
+
+[external] is required by recent gettext versions,
+USE_INCLUDED_LIBINTL is no longer defined by the gettext m4
+macro and was never documented anyway.
+
+Upstream-Status: Inappropriate [upstream is dead]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ configure.in | 2 +-
+ intl/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index aa20263..4bde433 100644
+--- a/configure.in
++++ b/configure.in
+@@ -256,7 +256,7 @@ AC_SUBST(CFLAGS)
+ AC_SUBST(LDFLAGS)
+ AC_SUBST(LIBS)
+
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+
+ AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME",[locale directory])
+
+diff --git a/intl/Makefile.in b/intl/Makefile.in
+index bbac1d5..7629a94 100644
+--- a/intl/Makefile.in
++++ b/intl/Makefile.in
+@@ -138,7 +138,7 @@ libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
+ DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
+ COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
+
+-all: all-@USE_INCLUDED_LIBINTL@
++all: all-no-no
+ all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
+ all-no: all-no-@BUILD_INCLUDED_LIBINTL@
+ all-no-yes: libgnuintl.$la
diff --git a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
index 34556b2c294..47962bcfffc 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
+++ b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
@@ -13,14 +13,15 @@ DEPENDS = ""
PR = "r6"
SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
- file://autotools.patch \
- file://makefile.patch \
- file://gettext.patch \
- file://acdefine.patch \
- file://lrzsz_fix_for_automake-1.12.patch \
+ file://autotools.patch \
+ file://makefile.patch \
+ file://gettext.patch \
+ file://acdefine.patch \
+ file://lrzsz_fix_for_automake-1.12.patch \
file://lrzsz-check-locale.h.patch \
file://cve-2018-10195.patch \
file://include.patch \
+ file://0009-Fix-issues-with-recent-gettext-versions.patch \
"
SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4"
--
2.17.1
next prev parent reply other threads:[~2019-12-02 17:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-02 17:54 [PATCH 01/18] rpm: upgrade to 4.15.1 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 02/18] gettext-minimal-native: update to 0.20.1 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 03/18] gettext: " Alexander Kanavin
2019-12-02 17:54 ` Alexander Kanavin [this message]
2019-12-02 17:54 ` [PATCH 05/18] p11-kit: convert to meson Alexander Kanavin
2019-12-02 17:54 ` [PATCH 06/18] psmisc: revert to default autopoint exclusion Alexander Kanavin
2019-12-02 17:54 ` [PATCH 07/18] sed: upgrade to 4.7 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 08/18] bind: update 9.11.5-P4 -> 9.11.13 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 09/18] flex: update to 2.6.4 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 10/18] gettext: fix failing ptests Alexander Kanavin
2019-12-02 17:54 ` [PATCH 11/18] libffi: update to 3.3 final Alexander Kanavin
2019-12-02 17:54 ` [PATCH 12/18] libcomps: update to 0.1.12 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 13/18] python3: update to 3.8.0 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 14/18] openssh: update to 8.1p1 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 15/18] gtk+3: update to 3.24.13 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 16/18] selftest: skip virgl gtk/sdl test on opensuse 15.0 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 17/18] gstreamer1.0-python: switch to meson Alexander Kanavin
2019-12-02 17:54 ` [PATCH 18/18] gstreamer1.0-python: add a patch to fix python 3.8 builds Alexander Kanavin
2019-12-02 18:02 ` ✗ patchtest: failure for "rpm: upgrade to 4.15.1..." and 17 more Patchwork
2019-12-02 22:46 ` [PATCH 01/18] rpm: upgrade to 4.15.1 akuster808
2019-12-03 11:13 ` Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191202175459.112655-4-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox