aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-17 16:59:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-18 00:08:29 +0000
commit25898f0fbd44ea7636bd59549fb8b3989d6efea2 (patch)
tree9ec44dc1826cb79980d96671f83bc71b4f08ec10
parenta67a5fd160f97129a6afd65f107cd2cbdfec41e7 (diff)
downloadmeta-gplv2-25898f0fbd44ea7636bd59549fb8b3989d6efea2.tar.gz
meta-gplv2-25898f0fbd44ea7636bd59549fb8b3989d6efea2.tar.bz2
meta-gplv2-25898f0fbd44ea7636bd59549fb8b3989d6efea2.zip
grep: fix builds with gettext 0.20.x
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch38
-rw-r--r--recipes-extended/grep/grep_2.5.1a.bb3
2 files changed, 40 insertions, 1 deletions
diff --git a/recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch b/recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch
new file mode 100644
index 0000000..a8042eb
--- /dev/null
+++ b/recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch
@@ -0,0 +1,38 @@
+From e11be23d694c8bd4e62252874d163d06b6de3117 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 17 Dec 2019 16:46:05 +0100
+Subject: [PATCH] Fix builds with gettext 0.20
+
+Upstream-Status: Inappropriate [fixing an old version]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Makefile.am | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index e4b58c4..a851b9d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to create Makefile.in
+ AUTOMAKE_OPTIONS = no-dependencies
+
+-SUBDIRS = intl po lib doc src tests m4 vms bootstrap
++SUBDIRS = po lib doc src tests m4 vms bootstrap
+
+ EXTRA_DIST = TODO README README-alpha PATCHES.AC PATCHES.AM
+
+diff --git a/configure.in b/configure.in
+index 2fa6c71..c042a10 100644
+--- a/configure.in
++++ b/configure.in
+@@ -70,7 +70,7 @@ esac
+
+ dnl I18N feature
+ ALL_LINGUAS="cs de el eo es et fr gl hr id it ja ko nl no pl pt_BR ru sl sv"
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+
+ dnl DOS file name convention
+ dnl sets HAVE_DOS_FILE_NAMES
diff --git a/recipes-extended/grep/grep_2.5.1a.bb b/recipes-extended/grep/grep_2.5.1a.bb
index b331fee..d3b4ddc 100644
--- a/recipes-extended/grep/grep_2.5.1a.bb
+++ b/recipes-extended/grep/grep_2.5.1a.bb
@@ -17,7 +17,8 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://fix-for-texinfo-5.1.patch \
file://grep-egrep-fgrep-Fix-LSB-NG-cases.patch \
file://search-fix-compilation-error-with-security-flags-ena.patch \
- "
+ file://0001-Fix-builds-with-gettext-0.20.patch \
+ "
SRC_URI[md5sum] = "52202fe462770fa6be1bb667bd6cf30c"
SRC_URI[sha256sum] = "38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132"