From 1a731b5f3164bef1a3b7c4948e7bf3e384c31330 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 17 Oct 2012 13:52:21 +0000 Subject: diffutils: Remove rather bizzare gettext macros 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. (From OE-Core rev: a40b89333652ca22a6e6957ab8a2a4e41b87b4c0) Signed-off-by: Richard Purdie --- meta/recipes-extended/diffutils/diffutils_3.2.bb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'meta/recipes-extended/diffutils') diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.2.bb index 74c371dc9e..dc8719089c 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" -- cgit v1.2.3-54-g00ecf