From 36400ed07ce4ef0a04c9d870cdd02452eb37ac67 Mon Sep 17 00:00:00 2001
From: Xin Ouyang <Xin.Ouyang@windriver.com>
Date: Fri, 17 Feb 2012 17:26:05 +0800
Subject: Fix build issue for null MAKEFLAGS passed to oe_runmake.

EXTRA_OEMAKE is typically: -e MAKEFLAGS=
Because of "MAKEFLAGS= ", ENV variables will not pass to subdirs.
This may cause some selinux packages build failed while
cross-building, so we redefine EXTRA_OEMAKE here.
---
 recipes-security/selinux/checkpolicy_2.1.8.bb | 9 ---------
 recipes-security/selinux/selinux_git.inc      | 6 ++++++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/recipes-security/selinux/checkpolicy_2.1.8.bb b/recipes-security/selinux/checkpolicy_2.1.8.bb
index 2ab24f6..8c5b788 100644
--- a/recipes-security/selinux/checkpolicy_2.1.8.bb
+++ b/recipes-security/selinux/checkpolicy_2.1.8.bb
@@ -16,15 +16,6 @@ EXTRA_OEMAKE += "LEX='flex'"
 
 BBCLASSEXTEND = "native"
 
-do_compile() {
-	oe_runmake checkpolicy checkmodule \
-            INCLUDEDIR='${STAGING_INCDIR}' \
-            LIBDIR='${STAGING_LIBDIR}'
-	oe_runmake -C test \
-            INCLUDEDIR='${STAGING_INCDIR}' \
-            LIBDIR='${STAGING_LIBDIR}'
-}
-
 do_install_append() {
 	install test/dismod ${D}/${bindir}/sedismod
 	install test/dispol ${D}/${bindir}/sedispol
diff --git a/recipes-security/selinux/selinux_git.inc b/recipes-security/selinux/selinux_git.inc
index 233b5ba..516ddb7 100644
--- a/recipes-security/selinux/selinux_git.inc
+++ b/recipes-security/selinux/selinux_git.inc
@@ -4,6 +4,12 @@ SRC_URI = "git://oss.tresys.com/git/selinux.git;protocol=http"
 SRC_URI[md5sum] = "4ec64a0d24aaa77c80b86e74d271e464"
 SRC_URI[sha256sum] = "9c8a8643c9a4dd0eb76fcda1420d636b750b84b27656c6f8bc6886a829d7e520"
 
+
+# EXTRA_OEMAKE is typically: -e MAKEFLAGS=
+# "MAKEFLAGS= " causes problems as ENV variables will not pass to subdirs, so
+# we redefine EXTRA_OEMAKE here
+EXTRA_OEMAKE = "-e"
+
 do_compile() {
     oe_runmake all \
             INCLUDEDIR='${STAGING_INCDIR}' \
-- 
cgit v1.2.3-54-g00ecf