Patchwork [1/3] bluez4: use PACKAGECONFIG to control 'pie'

login
register
mail settings
Submitter Christopher Larson
Date July 20, 2012, 11:46 p.m.
Message ID <f904e8dc0fb4e6b1d39feecaf87b2975c9c45d7c.1342827927.git.chris_larson@mentor.com>
Download mbox | patch
Permalink /patch/32771/
State Accepted
Commit 06b5d57e89f2dd20fb3f4cb9fd362e2d428f493d
Headers show

Comments

Christopher Larson - July 20, 2012, 11:46 p.m.
From: Christopher Larson <chris_larson@mentor.com>

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@mentor.com>
---
 meta/recipes-connectivity/bluez/bluez4.inc      |    6 +++++-
 meta/recipes-connectivity/bluez/bluez4_4.101.bb |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

Patch

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"