From 287d01851846b14bf5378077f5d8c9edf0fa4121 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 21 Mar 2012 16:30:37 +0000
Subject: gettext/awk/sed/grep: Backport WARNING fixes to GPLv2 versions

(From OE-Core rev: b60d0c57a2e16d690fd11c6349917efc57630004)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/gettext/gettext_0.16.1.bb | 6 +++++-
 meta/recipes-extended/gawk/gawk_3.1.5.bb    | 5 +++++
 meta/recipes-extended/grep/grep_2.5.1a.bb   | 1 +
 meta/recipes-extended/sed/sed_4.1.2.bb      | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'meta')

diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
index 73e5f55f99..0b7dfa30e1 100644
--- a/meta/recipes-core/gettext/gettext_0.16.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
@@ -31,7 +31,7 @@ PARALLEL_MAKE = ""
 
 inherit autotools
 
-EXTRA_OECONF += "--without-lisp --disable-csharp --disable-openmp"
+EXTRA_OECONF += "--without-lisp --disable-csharp --disable-openmp --without-emacs"
 acpaths = '-I ${S}/autoconf-lib-link/m4/ \
            -I ${S}/gettext-runtime/m4 \
            -I ${S}/gettext-tools/m4'
@@ -53,3 +53,7 @@ do_configure_prepend() {
 PACKAGES =+ "libgettextlib libgettextsrc"
 FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
 FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+
+do_install_append() {
+	rm -f ${D}${libdir}/preloadable_libintl.so
+}
diff --git a/meta/recipes-extended/gawk/gawk_3.1.5.bb b/meta/recipes-extended/gawk/gawk_3.1.5.bb
index bd8460d79e..d5d9beaa49 100644
--- a/meta/recipes-extended/gawk/gawk_3.1.5.bb
+++ b/meta/recipes-extended/gawk/gawk_3.1.5.bb
@@ -33,3 +33,8 @@ ALTERNATIVE_NAME = "awk"
 ALTERNATIVE_PATH = "gawk"
 ALTERNATIVE_LINK = "${bindir}/awk"
 ALTERNATIVE_PRIORITY = "100"
+
+do_install_append() {
+	# remove the link since we don't package it
+	rm ${D}${bindir}/awk
+}
diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb
index bb4f53fb02..64064fc5c6 100644
--- a/meta/recipes-extended/grep/grep_2.5.1a.bb
+++ b/meta/recipes-extended/grep/grep_2.5.1a.bb
@@ -27,6 +27,7 @@ do_install () {
 	mv ${D}${bindir}/grep ${D}${base_bindir}/grep.${PN}
 	mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep.${PN}
 	mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep.${PN}
+	rmdir ${D}${bindir}/
 }
 
 pkg_postinst_${PN} () {
diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
index 713524c41d..8baa180f72 100644
--- a/meta/recipes-extended/sed/sed_4.1.2.bb
+++ b/meta/recipes-extended/sed/sed_4.1.2.bb
@@ -18,6 +18,7 @@ do_install () {
 	autotools_do_install
 	install -d ${D}${base_bindir}
 	mv ${D}${bindir}/sed ${D}${base_bindir}/sed.${PN}
+	rmdir ${D}${bindir}/
 }
 
 ALTERNATIVE_NAME = "sed"
-- 
cgit v1.2.3-54-g00ecf