From: Kefu Chai <kchai@redhat.com>
Date: Mon, 11 Sep 2017 13:53:57 +0000 (+0800)
Subject: admon/build-doc: be compatible with py3
X-Git-Tag: v13.0.1~954^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17640%2Fhead;p=ceph.git

admon/build-doc: be compatible with py3

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/admin/build-doc b/admin/build-doc
index e62c58401963..3796efe6cc1f 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