From f8cc72ff1ce5427e1cd097f15b694bbdfca95acb Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 11 Sep 2017 21:53:57 +0800 Subject: [PATCH] admon/build-doc: be compatible with py3 Signed-off-by: Kefu Chai --- admin/build-doc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/admin/build-doc b/admin/build-doc index e62c584019633..3796efe6cc1f5 100755 --- a/admin/build-doc +++ b/admin/build-doc @@ -57,7 +57,7 @@ cd build-doc [ -z "$vdir" ] && vdir="$TOPDIR/build-doc/virtualenv" if [ ! -e $vdir ]; then - virtualenv --system-site-packages $vdir -p python2 + virtualenv --system-site-packages $vdir fi $vdir/bin/pip install --quiet -r $TOPDIR/admin/doc-requirements.txt @@ -88,7 +88,12 @@ for bind in rados rbd cephfs rgw; do LDFLAGS="-L$vdir/lib -Wl,--no-as-needed" \ $vdir/bin/pip install $TOPDIR/src/pybind/${bind} # rgwfile_version(), librgw_create(), rgw_mount() - nm $vdir/lib/python*/*-packages/${bind}.so | grep -E "U (lib)?${bind}" | \ + # since py3.5, distutils adds postfix in between ${bind} and so + lib_fn=$vdir/lib/python*/*-packages/${bind}.*.so + if [ ! -e $lib_fn ]; then + lib_fn=$vdir/lib/python*/*-packages/${bind}.so + fi + nm $lib_fn | grep -E "U (lib)?${bind}" | \ awk '{ print "void "$2"(void) {}" }' | \ gcc -shared -o $vdir/lib/lib${bind}.so.1 -xc - if [ ${bind} != rados ]; then -- 2.39.5