aboutsummaryrefslogtreecommitdiffstats
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:41:30 -0400
commit6bce7e7c5236c83d1fdc611973d223658b2b23cb (patch)
treed6ef58c4b3be9835d2f454d92caf1f6bae608cd7
parent0877d0a41b0386a42f146a9c884ddeba3f77c983 (diff)
downloadmeta-cloud-services-6bce7e7c5236c83d1fdc611973d223658b2b23cb.tar.gz
meta-cloud-services-6bce7e7c5236c83d1fdc611973d223658b2b23cb.tar.bz2
meta-cloud-services-6bce7e7c5236c83d1fdc611973d223658b2b23cb.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>
-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: