diff options
| author | Hector Martin <marcan@marcan.st> | 2015-12-01 15:20:01 +0100 |
|---|---|---|
| committer | Hector Martin <marcan@marcan.st> | 2015-12-01 16:29:54 +0100 |
| commit | 5113c962eee8926c41bbb86d96c6f0f5b50588d6 (patch) | |
| tree | cf49de6a435071527abfd475baa6cb8d58b90f5e /admin | |
| parent | Merge pull request #6749 from dachary/wip-doc-install (diff) | |
| download | ceph-5113c962eee8926c41bbb86d96c6f0f5b50588d6.tar.xz ceph-5113c962eee8926c41bbb86d96c6f0f5b50588d6.zip | |
configure/packaging: introduce Cython dependency
To prepare for the migration of rbd.py to Cython, add Cython as a package
dependency and have the configure script look for it.
Also adds Cython as a dependency for admin/build-doc, and changes the
virtualenv to allow usage of system packages (to avoid having to compile
Cython inside the virtualenv).
With contributions by Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Hector Martin <marcan@marcan.st>
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/build-doc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/admin/build-doc b/admin/build-doc index 74892321b8f..37411667dcf 100755 --- a/admin/build-doc +++ b/admin/build-doc @@ -7,7 +7,7 @@ TOPDIR=`pwd` install -d -m0755 build-doc if command -v dpkg >/dev/null; then - for package in python-dev python-pip python-virtualenv doxygen ditaa ant libxml2-dev libxslt1-dev; do + for package in python-dev python-pip python-virtualenv doxygen ditaa ant libxml2-dev libxslt1-dev cython; do if [ "$(dpkg --status -- $package|sed -n 's/^Status: //p')" != "install ok installed" ]; then # add a space after old values missing="${missing:+$missing }$package" @@ -19,7 +19,7 @@ if command -v dpkg >/dev/null; then exit 1 fi elif command -v yum >/dev/null; then - for package in python-devel python-pip python-virtualenv doxygen ditaa ant libxml-devel libxslt-devel; do + for package in python-devel python-pip python-virtualenv doxygen ditaa ant libxml-devel libxslt-devel Cython; do if ! rpm -q $package >/dev/null ; then missing="${missing:+$missing }$package" fi @@ -30,7 +30,7 @@ elif command -v yum >/dev/null; then exit 1 fi else - for command in virtualenv doxygen ant ditaa; do + for command in virtualenv doxygen ant ditaa cython; do command -v "$command" > /dev/null; ret_code=$? if [ $ret_code -ne 0 ]; then @@ -56,7 +56,7 @@ cd build-doc [ -z "$vdir" ] && vdir="./virtualenv" if [ ! -e $vdir ]; then - virtualenv --no-site-packages $vdir + virtualenv --system-site-packages $vdir fi $vdir/bin/pip install --quiet -r ../admin/doc-requirements.txt |