aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-08-20 11:09:34 -0500
committerScott Garman <scott.a.garman@intel.com>2012-08-24 00:38:17 -0700
commit318bc896b1bd5399807a417865b8e088d9d9eb15 (patch)
treeac8046e07deaeb7765a9fb2ae1f62c26987403b4
parent7ee10f25430421dc6e9552ffe15a6a5acbd4cb51 (diff)
downloadopenembedded-core-318bc896b1bd5399807a417865b8e088d9d9eb15.tar.gz
glib.inc: disable selinux for native builds
In addition to dbus, we also need to disable selinux for glib as well otherwise we will get the same link error (Note: Upstream master has disabled selinux AFAICT) Signed-off-by: Matthew McClintock <msm@freescale.com>
-rw-r--r--meta/recipes-core/dbus/dbus-glib_0.98.bb2
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb2
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib_0.98.bb b/meta/recipes-core/dbus/dbus-glib_0.98.bb
index bd9389a9f5..e2c6a0ccf1 100644
--- a/meta/recipes-core/dbus/dbus-glib_0.98.bb
+++ b/meta/recipes-core/dbus/dbus-glib_0.98.bb
@@ -1,6 +1,6 @@
require dbus-glib.inc
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "3f7f117dc7c8d899d9acfdcbf9253fb8"
SRC_URI[sha256sum] = "297c81d6bb8b1c312e9b0ccfe91eb28ec0672756abb64dfb7bbe2b5f1ae5d111"
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb
index f1f9217d1b..81037a4cf8 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb
@@ -1,6 +1,6 @@
require glib.inc
-PR = "r1"
+PR = "r2"
PE = "1"
DEPENDS += "libffi python-argparse-native zlib"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 835743aa98..8eda1169e4 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -26,7 +26,7 @@ inherit autotools pkgconfig gettext
S = "${WORKDIR}/glib-${PV}"
EXTRA_OECONF = "--disable-debug --enable-included-printf=no --disable-dtrace --disable-fam"
-EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap --disable-fam"
+EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap --disable-fam --disable-selinux"
EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no --disable-dtrace --disable-fam"
FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"