diffutils: Remove rather bizzare gettext macros

Submitted by Richard Purdie on Oct. 17, 2012, 3:05 p.m.

Details

Message ID 1350486326.2185.86.camel@ted
State New
Headers show

Commit Message

Richard Purdie Oct. 17, 2012, 3:05 p.m.

Patch hide | download patch | download mbox

diffutils has a rather confused set of getext macros with different names and
strange conflicting version requirements. This patch removes the problematic
macros allowing it to 'gettextize' to the latest standard gettext code without
issue.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.2.bb
index 74c371d..dc87190 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.2.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.2.bb
@@ -3,6 +3,13 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 require diffutils.inc
 
+do_configure_prepend () {
+	# Need to remove gettext macros with weird mix of versions
+	for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do
+		rm ${S}/m4/$i
+	done
+}
+
 PR = "${INC_PR}.0"
 
 SRC_URI += "file://remove-gets.patch"