summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-13 22:38:07 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:36:26 +0000
commitc929bd3e9a1657cae93e2cf1d28642523efa2d93 (patch)
tree6b3d8bdc36c3470e68720f11ffa20cf54a19aebc /meta
parent77125fe0386a964c25bf2dfa0e4e949170232afe (diff)
downloadpoky-c929bd3e9a1657cae93e2cf1d28642523efa2d93.tar.gz
texi2html: update po_document/Makefile.in.in for new gettext
* The autotools_do_configure updates po/Makefile.in.in, we also need update po_document and po_messages. Fixed: *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.18 but the autoconf macros are from gettext version 0.19 * Remove fix_gettext_version.patch, it wasn't a correct fix. * Remove unneeded code from do_configure_append/prepend(). (From OE-Core rev: 5633b4e12560eab4c748e1fdf8216c3db310b34f) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch31
-rw-r--r--meta/recipes-extended/texi2html/texi2html_5.0.bb15
2 files changed, 5 insertions, 41 deletions
diff --git a/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch b/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
deleted file mode 100644
index d1c9fe5746..0000000000
--- a/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1
2Upstream-Status: Inappropriate [configuration]
3
4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5
6Index: texi2html-5.0/po_document/Makefile.in.in
7===================================================================
8--- texi2html-5.0.orig/po_document/Makefile.in.in
9+++ texi2html-5.0/po_document/Makefile.in.in
10@@ -9,7 +9,7 @@
11 # General Public License and is *not* in the public domain.
12 #
13 # Origin: gettext-0.17
14-GETTEXT_MACRO_VERSION = 0.17
15+GETTEXT_MACRO_VERSION = 0.18
16
17 PACKAGE = @PACKAGE@
18 VERSION = @VERSION@
19Index: texi2html-5.0/po_messages/Makefile.in.in
20===================================================================
21--- texi2html-5.0.orig/po_messages/Makefile.in.in
22+++ texi2html-5.0/po_messages/Makefile.in.in
23@@ -9,7 +9,7 @@
24 # General Public License and is *not* in the public domain.
25 #
26 # Origin: gettext-0.17
27-GETTEXT_MACRO_VERSION = 0.17
28+GETTEXT_MACRO_VERSION = 0.18
29
30 PACKAGE = @PACKAGE@
31 VERSION = @VERSION@
diff --git a/meta/recipes-extended/texi2html/texi2html_5.0.bb b/meta/recipes-extended/texi2html/texi2html_5.0.bb
index aa5f1fddaf..eac289e3b5 100644
--- a/meta/recipes-extended/texi2html/texi2html_5.0.bb
+++ b/meta/recipes-extended/texi2html/texi2html_5.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
7PR = "r2" 7PR = "r2"
8 8
9SRC_URI = "${SAVANNAH_GNU_MIRROR}/texi2html/${BPN}-${PV}.tar.bz2 \ 9SRC_URI = "${SAVANNAH_GNU_MIRROR}/texi2html/${BPN}-${PV}.tar.bz2 \
10 file://fix_gettext_version.patch" 10 "
11 11
12SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54" 12SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54"
13SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa" 13SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa"
@@ -15,15 +15,10 @@ SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89
15inherit autotools gettext texinfo 15inherit autotools gettext texinfo
16 16
17do_configure_prepend() { 17do_configure_prepend() {
18 # Make a directory for the old gettext setup 18 # autotools_do_configure updates po/Makefile.in.in, we also need
19 if [ ! -d ${S}/po ]; then 19 # update po_document.
20 mkdir ${S}/po 20 cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/
21 fi 21 cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_messages/
22}
23
24do_configure_append() {
25 # Clean up the phony po directory
26 rm -rf ${S}/po
27} 22}
28 23
29do_install_append () { 24do_install_append () {