diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2019-11-21 17:32:25 +0100 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2019-11-27 12:31:39 -0800 |
| commit | 8d7d2c22e618206a1e93e2091ea2f81a7d179dce (patch) | |
| tree | 5c08f68e43c5590f8d8cf6fd28ab02c934d8f21c | |
| parent | 218e9a46cb89da1a1372abcabc418660f03e9d26 (diff) | |
| download | openembedded-core-contrib-8d7d2c22e618206a1e93e2091ea2f81a7d179dce.tar.gz | |
lrzsz: fix issues with newer versions of gettext
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/recipes-bsp/lrzsz/lrzsz-0.12.20/0009-Fix-issues-with-recent-gettext-versions.patch | 42 | ||||
| -rw-r--r-- | meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb | 11 |
2 files changed, 48 insertions, 5 deletions
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 0000000000..c8a05f3818 --- /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 34556b2c29..47962bcfff 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" |