[oe-commits] Robert Yang : texi2html: update po_document/Makefile.in.in for new gettext

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 5633b4e12560eab4c748e1fdf8216c3db310b34f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5633b4e12560eab4c748e1fdf8216c3db310b34f

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Tue Jan 13 22:38:07 2015 -0800

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().

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>

---

 .../texi2html-5.0/fix_gettext_version.patch        | 31 ----------------------
 meta/recipes-extended/texi2html/texi2html_5.0.bb   | 15 ++++-------
 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 d1c9fe5..0000000
--- a/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Saul Wold <sgw at 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@
diff --git a/meta/recipes-extended/texi2html/texi2html_5.0.bb b/meta/recipes-extended/texi2html/texi2html_5.0.bb
index aa5f1fd..eac289e 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"
 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 () {