diff options
author | Matthew McClintock <msm@freescale.com> | 2012-08-20 11:09:34 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-28 16:53:03 +0100 |
commit | 758677e212f59b426817e627ef7b1df02e7975a3 (patch) | |
tree | 8c3544fb1fbeacfc01828fe43f0df82c2a2f5c7b /meta/recipes-core | |
parent | b96bd8465ab953bdeb166923777751bc9bbd85b4 (diff) | |
download | poky-758677e212f59b426817e627ef7b1df02e7975a3.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)
(From OE-Core rev: 318bc896b1bd5399807a417865b8e088d9d9eb15)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/dbus/dbus-glib_0.98.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 2 |
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 @@ | |||
1 | require dbus-glib.inc | 1 | require dbus-glib.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r1" |
4 | 4 | ||
5 | SRC_URI[md5sum] = "3f7f117dc7c8d899d9acfdcbf9253fb8" | 5 | SRC_URI[md5sum] = "3f7f117dc7c8d899d9acfdcbf9253fb8" |
6 | SRC_URI[sha256sum] = "297c81d6bb8b1c312e9b0ccfe91eb28ec0672756abb64dfb7bbe2b5f1ae5d111" | 6 | 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 @@ | |||
1 | require glib.inc | 1 | require glib.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | DEPENDS += "libffi python-argparse-native zlib" | 6 | 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 | |||
26 | S = "${WORKDIR}/glib-${PV}" | 26 | S = "${WORKDIR}/glib-${PV}" |
27 | 27 | ||
28 | EXTRA_OECONF = "--disable-debug --enable-included-printf=no --disable-dtrace --disable-fam" | 28 | EXTRA_OECONF = "--disable-debug --enable-included-printf=no --disable-dtrace --disable-fam" |
29 | EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap --disable-fam" | 29 | EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap --disable-fam --disable-selinux" |
30 | EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no --disable-dtrace --disable-fam" | 30 | EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no --disable-dtrace --disable-fam" |
31 | 31 | ||
32 | FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas" | 32 | FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas" |