From c3bb97b03b76ad73412bb0763bfd636171469477 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Fri, 20 Jul 2012 09:24:06 -0700 Subject: bluez4: use PACKAGECONFIG to control 'pie' This lets us control whether we build position independent executables. As, as far as I know no distros are adding a 'pie' distro feature, the effect of this commit for most will be to disable pie in bluez4. I think this is best to ensure consistent behavior among the recipes with regard to this. This also sidesteps a build failure I've seen with bluez4 failing due to libudev.a not having been built fPIC. (From OE-Core rev: 06b5d57e89f2dd20fb3f4cb9fd362e2d428f493d) Signed-off-by: Christopher Larson Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bluez/bluez4.inc | 6 +++++- meta/recipes-connectivity/bluez/bluez4_4.101.bb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc index 6dc06f46b9..6ddd58df0c 100644 --- a/meta/recipes-connectivity/bluez/bluez4.inc +++ b/meta/recipes-connectivity/bluez/bluez4.inc @@ -10,8 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck" RDEPENDS_${PN}-dev = "bluez-hcidump" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" +PACKAGECONFIG ??= "\ + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\ + ${@base_contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\ +" PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[pie] = "--enable-pie,--disable-pie," ASNEEDED = "" diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb index 4a360b693e..e26d4eac8b 100644 --- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb +++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb @@ -1,6 +1,6 @@ require bluez4.inc -PR = "r1" +PR = "r2" SRC_URI += "file://bluetooth.conf \ file://sbc_mmx.patch" -- cgit v1.2.3-54-g00ecf