aboutsummaryrefslogtreecommitdiffstats
path: root/meta-openstack
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-07-29 09:41:18 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-07-29 12:36:58 -0400
commit68d6ee87d52d52b1bb9d24c89e0609763ca406e7 (patch)
tree87c37621f705ec9b08f55a72a721d7784655c236 /meta-openstack
parent3bbd08214617f5a5e7b54253f9f8b786623546c8 (diff)
downloadmeta-cloud-services-68d6ee87d52d52b1bb9d24c89e0609763ca406e7.tar.gz
meta-cloud-services-68d6ee87d52d52b1bb9d24c89e0609763ca406e7.tar.bz2
meta-cloud-services-68d6ee87d52d52b1bb9d24c89e0609763ca406e7.zip
uwsgi: remove floating yajl dependency
uwsgi is using pkg-config to detect whether or not yajl is present in the build. We do want to use yajl, so we add an explicit dependency and pkgconfig inherit. Without this, build errors may occur, since the build paths that don't use yajl are not supported. And finally, to prevent the searching of host include paths, we set UWSGI_REMOVE_INCLUDES and purge local directories. This ensures that only the sysroot and package config settings are used. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack')
-rw-r--r--meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
index e8c0fb4..7de85e8 100644
--- a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
+++ b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
@@ -14,12 +14,16 @@ SRCREV="7604c6701809602804e3961f7fdb201049b8c993"
PV="2.0.4+git${SRCPV}"
S = "${WORKDIR}/git"
-inherit setuptools
+inherit setuptools pkgconfig
+
+# prevent host contamination and remove local search paths
+export UWSGI_REMOVE_INCLUDES = "/usr/include,/usr/local/include"
DEPENDS += " \
e2fsprogs \
python-pip \
python-six \
+ yajl \
"
# RDEPENDS_default: