summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-09-11 16:41:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-13 07:42:28 +0100
commit529daba8743800bd74487e41451360f9b1cd5369 (patch)
tree2eaf8cb13581e32d58e0dbf5cfb2d792a7053c6e
parent5bf97f67414ad848f13a277164db790aaa55db34 (diff)
downloadpoky-529daba8743800bd74487e41451360f9b1cd5369.tar.gz
python3: add PACKAGECONFIG for bluetooth
Instead of forcibly disabling Bluetooth (support for Bluetooth sockets in the socket module), add a PACKAGECONFIG. The default remains disabled for consistency. (From OE-Core rev: fd5b497cc8a2f9f93f732070123b073bfb6d2eca) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python3.inc b/meta/recipes-devtools/python/python3.inc
index 3207f91ab8..f565b3f171 100644
--- a/meta/recipes-devtools/python/python3.inc
+++ b/meta/recipes-devtools/python/python3.inc
@@ -23,7 +23,7 @@ PYTHON_BINABI = "${PYTHON_MAJMIN}m"
23 23
24S = "${WORKDIR}/Python-${PV}" 24S = "${WORKDIR}/Python-${PV}"
25 25
26inherit autotools pkgconfig 26inherit autotools bluetooth pkgconfig
27 27
28EXTRA_OECONF = "\ 28EXTRA_OECONF = "\
29 --with-threads \ 29 --with-threads \
@@ -32,9 +32,10 @@ EXTRA_OECONF = "\
32 --with-signal-module \ 32 --with-signal-module \
33 --enable-shared \ 33 --enable-shared \
34 --enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \ 34 --enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \
35 ac_cv_header_bluetooth_bluetooth_h=no ac_cv_header_bluetooth_h=no \
36" 35"
37 36
37PACKAGECONFIG[bluetooth] = ",ac_cv_header_bluetooth_bluetooth_h=no ac_cv_header_bluetooth_h=no,${BLUEZ}"
38
38do_install_append () { 39do_install_append () {
39 sed -i -e 's:${HOSTTOOLS_DIR}/install:install:g' \ 40 sed -i -e 's:${HOSTTOOLS_DIR}/install:install:g' \
40 -e 's:${HOSTTOOLS_DIR}/mkdir:mkdir:g' \ 41 -e 's:${HOSTTOOLS_DIR}/mkdir:mkdir:g' \