summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2012-07-20 16:24:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-28 08:20:51 (GMT)
commitc3bb97b03b76ad73412bb0763bfd636171469477 (patch)
tree86a9982c2609efa349ce3edfbc983b077719da7a /meta/recipes-connectivity
parente95eff10498fe6bd0aba38b566e220a3a55aa60f (diff)
downloadpoky-c3bb97b03b76ad73412bb0763bfd636171469477.tar.gz
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 <chris_larson@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/bluez/bluez4.inc6
-rw-r--r--meta/recipes-connectivity/bluez/bluez4_4.101.bb2
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 \
10DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck" 10DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck"
11RDEPENDS_${PN}-dev = "bluez-hcidump" 11RDEPENDS_${PN}-dev = "bluez-hcidump"
12 12
13PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 13PACKAGECONFIG ??= "\
14 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
15 ${@base_contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\
16"
14PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" 17PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
18PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
15 19
16ASNEEDED = "" 20ASNEEDED = ""
17 21
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 @@
1require bluez4.inc 1require bluez4.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI += "file://bluetooth.conf \ 5SRC_URI += "file://bluetooth.conf \
6 file://sbc_mmx.patch" 6 file://sbc_mmx.patch"