summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2017-01-05 00:23:26 -0800
committerJoe MacDonald <joe_macdonald@mentor.com>2017-01-05 10:18:31 -0500
commit68fc3af746701ea10cf8f081dc96a0ee61f1025e (patch)
tree5c4ca36b1f2f8e083b540ca26c018823acbbbbf0
parent8a438c84ee7ae21c79eb028316dc75b9ab3e4786 (diff)
downloadmeta-selinux-68fc3af746701ea10cf8f081dc96a0ee61f1025e.tar.gz
selinux_common: remove EXTRA_OEMAKE = "-e"
Some variables are exported by top Makefile and updated from sub Makefile (such as PCRE_LDFLAGS, DISABLE_FLAGS ...). The '-e' option prevents those variables from updating in the sub Makefile and causes libselinux build errors: | label.lo:(.data.rel.ro.local+0x20): undefined reference to `selabel_property_init' | label.lo:(.data.rel.ro.local+0x28): undefined reference to `selabel_service_init' oe-core also cleaned such default value from commit: aeb65386 Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-security/selinux/selinux_common.inc5
1 files changed, 0 insertions, 5 deletions
diff --git a/recipes-security/selinux/selinux_common.inc b/recipes-security/selinux/selinux_common.inc
index 7efa694..e4c23a1 100644
--- a/recipes-security/selinux/selinux_common.inc
+++ b/recipes-security/selinux/selinux_common.inc
@@ -1,10 +1,5 @@
1HOMEPAGE = "https://github.com/SELinuxProject" 1HOMEPAGE = "https://github.com/SELinuxProject"
2 2
3# EXTRA_OEMAKE is typically: -e MAKEFLAGS=
4# "MAKEFLAGS= " causes problems as ENV variables will not pass to subdirs, so
5# we redefine EXTRA_OEMAKE here
6EXTRA_OEMAKE = "-e"
7
8do_compile() { 3do_compile() {
9 oe_runmake all \ 4 oe_runmake all \
10 INCLUDEDIR='${STAGING_INCDIR}' \ 5 INCLUDEDIR='${STAGING_INCDIR}' \