summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-19 13:02:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-19 14:06:09 +0100
commit1096942a7548ff761591e50a5232f17821c3c579 (patch)
tree69ef30d0e63e24364bdbce36d1124b8e6c1e3bf5 /meta/recipes-extended
parentd497fe9f965836bd6a148908a4fa155932d93681 (diff)
downloadpoky-1096942a7548ff761591e50a5232f17821c3c579.tar.gz
grep: Fix gplv2 version to work with recent gettext
(From OE-Core rev: 2433846255767d5a22fb2c7b2b723f290ac12fbf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/grep/grep-2.5.1a/Makevars25
-rw-r--r--meta/recipes-extended/grep/grep-2.5.1a/gettext.patch15
-rw-r--r--meta/recipes-extended/grep/grep_2.5.1a.bb3
3 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/Makevars b/meta/recipes-extended/grep/grep-2.5.1a/Makevars
new file mode 100644
index 0000000000..8b09f53b0f
--- /dev/null
+++ b/meta/recipes-extended/grep/grep-2.5.1a/Makevars
@@ -0,0 +1,25 @@
1# Makefile variables for PO directory in any package using GNU gettext.
2
3# Usually the message domain is the same as the package name.
4DOMAIN = $(PACKAGE)
5
6# These two variables depend on the location of this directory.
7subdir = po
8top_builddir = ..
9
10# These options get passed to xgettext.
11XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
12
13# This is the copyright holder that gets inserted into the header of the
14# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
15# package. (Note that the msgstr strings, extracted from the package's
16# sources, belong to the copyright holder of the package.) Translators are
17# expected to transfer the copyright for their translations to this person
18# or entity, or to disclaim their copyright. The empty string stands for
19# the public domain; in this case the translators are expected to disclaim
20# their copyright.
21COPYRIGHT_HOLDER = Free Software Foundation, Inc.
22
23# This is the list of locale categories, beyond LC_MESSAGES, for which the
24# message catalogs shall be used. It is usually empty.
25EXTRA_LOCALE_CATEGORIES =
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/gettext.patch b/meta/recipes-extended/grep/grep-2.5.1a/gettext.patch
new file mode 100644
index 0000000000..57463355a7
--- /dev/null
+++ b/meta/recipes-extended/grep/grep-2.5.1a/gettext.patch
@@ -0,0 +1,15 @@
1Enable operation with later versions of gettext.
2
3Upstream-Status: Inappropriate
4RP 2012/10/19
5
6Index: grep-2.5.1a/configure.in
7===================================================================
8--- grep-2.5.1a.orig/configure.in 2012-10-19 12:57:51.646970204 +0000
9+++ grep-2.5.1a/configure.in 2012-10-19 12:59:49.946968803 +0000
10@@ -140,4 +140,4 @@
11 AC_CHECK_LIB(pcre, pcre_exec)
12 fi
13
14-AC_OUTPUT(Makefile lib/Makefile lib/posix/Makefile src/Makefile tests/Makefile po/Makefile.in intl/Makefile doc/Makefile m4/Makefile vms/Makefile bootstrap/Makefile, [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; echo timestamp > stamp-h])
15+AC_OUTPUT(Makefile lib/Makefile lib/posix/Makefile src/Makefile tests/Makefile po/Makefile.in intl/Makefile doc/Makefile m4/Makefile vms/Makefile bootstrap/Makefile, [echo timestamp > stamp-h])
diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb
index 3a8bcbfdb7..ebcbe23ca0 100644
--- a/meta/recipes-extended/grep/grep_2.5.1a.bb
+++ b/meta/recipes-extended/grep/grep_2.5.1a.bb
@@ -10,6 +10,8 @@ PR = "r2"
10SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \ 10SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
11 file://uclibc-fix.patch \ 11 file://uclibc-fix.patch \
12 file://grep_fix_for_automake-1.12.patch \ 12 file://grep_fix_for_automake-1.12.patch \
13 file://gettext.patch \
14 file://Makevars \
13 " 15 "
14 16
15SRC_URI[md5sum] = "52202fe462770fa6be1bb667bd6cf30c" 17SRC_URI[md5sum] = "52202fe462770fa6be1bb667bd6cf30c"
@@ -22,6 +24,7 @@ EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
22CFLAGS += "-D PROTOTYPES" 24CFLAGS += "-D PROTOTYPES"
23do_configure_prepend () { 25do_configure_prepend () {
24 rm -f ${S}/m4/init.m4 26 rm -f ${S}/m4/init.m4
27 cp -f ${WORKDIR}/Makevars ${S}/po/
25} 28}
26 29
27do_install () { 30do_install () {