sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Robert Yang 2015-01-13 22:38:07 -08:00 committed by Richard Purdie
parent 77125fe038
commit c929bd3e9a
2 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
View File

@ -1,31 +0,0 @@
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Index: texi2html-5.0/po_document/Makefile.in.in
===================================================================
--- texi2html-5.0.orig/po_document/Makefile.in.in
+++ texi2html-5.0/po_document/Makefile.in.in
@@ -9,7 +9,7 @@
# General Public License and is *not* in the public domain.
#
# Origin: gettext-0.17
-GETTEXT_MACRO_VERSION = 0.17
+GETTEXT_MACRO_VERSION = 0.18
PACKAGE = @PACKAGE@
VERSION = @VERSION@
Index: texi2html-5.0/po_messages/Makefile.in.in
===================================================================
--- texi2html-5.0.orig/po_messages/Makefile.in.in
+++ texi2html-5.0/po_messages/Makefile.in.in
@@ -9,7 +9,7 @@
# General Public License and is *not* in the public domain.
#
# Origin: gettext-0.17
-GETTEXT_MACRO_VERSION = 0.17
+GETTEXT_MACRO_VERSION = 0.18
PACKAGE = @PACKAGE@
VERSION = @VERSION@

15
meta/recipes-extended/texi2html/texi2html_5.0.bb
View File

@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
PR = "r2"
SRC_URI = "${SAVANNAH_GNU_MIRROR}/texi2html/${BPN}-${PV}.tar.bz2 \
file://fix_gettext_version.patch"
"
SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54"
SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa"
@ -15,15 +15,10 @@ SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89
inherit autotools gettext texinfo
do_configure_prepend() {
# Make a directory for the old gettext setup
if [ ! -d ${S}/po ]; then
mkdir ${S}/po
fi
}
do_configure_append() {
# Clean up the phony po directory
rm -rf ${S}/po
# autotools_do_configure updates po/Makefile.in.in, we also need
# update po_document.
cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/
cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_messages/
}
do_install_append () {