update sources to v12.1.0

[ceph.git] / ceph / install-deps.sh

diff --git a/ceph/install-deps.sh b/ceph/install-deps.sh
index 90347622e29ec47d7d8afd77fd641b5a6caa2717..626cbc9e39780637b36b3611ddc3a50e112b7106 100755 (executable)
--- a/ceph/install-deps.sh
+++ b/ceph/install-deps.sh
@@ -22,6 +22,7 @@ export LC_ALL=C # the following is vulnerable to i18n
 if [ x`uname`x = xFreeBSDx ]; then
     $SUDO pkg install -yq \
         devel/git \
+        devel/gperf \
         devel/gmake \
         devel/cmake \
         devel/yasm \
@@ -29,7 +30,6 @@ if [ x`uname`x = xFreeBSDx ]; then
         devel/boost-python-libs \
         devel/valgrind \
         devel/pkgconf \
-        devel/libatomic_ops \
         devel/libedit \
         devel/libtool \
         devel/google-perftools \
@@ -52,6 +52,7 @@ if [ x`uname`x = xFreeBSDx ]; then
         emulators/fuse \
         java/junit \
         lang/python27 \
+       devel/py-pip \
         devel/py-argparse \
         devel/py-nose \
         www/py-flask \
@@ -59,6 +60,9 @@ if [ x`uname`x = xFreeBSDx ]; then
         sysutils/flock \
         sysutils/fusefs-libs \
 
+       # Now use pip to install some extra python modules
+       pip install pecan
+
     exit
 else
     source /etc/os-release
@@ -159,7 +163,8 @@ function populate_wheelhouse() {
 
     # although pip comes with virtualenv, having a recent version
     # of pip matters when it comes to using wheel packages
-    pip --timeout 300 $install 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' || return 1
+    # workaround of https://github.com/pypa/setuptools/issues/1042
+    pip --timeout 300 $install 'setuptools >= 0.8,< 36' 'pip >= 7.0' 'wheel >= 0.24' || return 1
     if test $# != 0 ; then
         pip --timeout 300 $install $@ || return 1
     fi