[oe-commits] Christopher Larson : bluez4: use PACKAGECONFIG to control 'pie'
git at git.openembedded.org
git at git.openembedded.org
Sat Jul 28 08:22:04 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 06b5d57e89f2dd20fb3f4cb9fd362e2d428f493d
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=06b5d57e89f2dd20fb3f4cb9fd362e2d428f493d
Author: Christopher Larson <chris_larson at mentor.com>
Date: Fri Jul 20 09:24:06 2012 -0700
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.
Signed-off-by: Christopher Larson <chris_larson at mentor.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/recipes-connectivity/bluez/bluez4.inc | 6 +++++-
meta/recipes-connectivity/bluez/bluez4_4.101.bb | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index 6dc06f4..6ddd58d 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 4a360b6..e26d4ea 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"
More information about the Openembedded-commits
mailing list