From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 28 Feb 2019 13:49:45 +0000 (+0100)
Subject: do_cmake.sh: SUSE builds need WITH_RADOSGW_AMQP_ENDPOINT=OFF
X-Git-Tag: v14.1.1~85^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26695%2Fhead;p=ceph.git

do_cmake.sh: SUSE builds need WITH_RADOSGW_AMQP_ENDPOINT=OFF

Without this patch, "make check" fails on SUSE systems because
WITH_RADOS_AMQP_ENDPOINT defaults to "ON".

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/do_cmake.sh b/do_cmake.sh
index 4746be3f130c..72fdb8eb37a1 100755
--- a/do_cmake.sh
+++ b/do_cmake.sh
@@ -21,6 +21,7 @@ case "$ID" in
         ;;
     opensuse*|suse|sles)
         PYBUILD="3"
+        WITH_RADOSGW_AMQP_ENDPOINT="OFF"
         ;;
 esac
 if [ "$PYBUILD" = "3" ] ; then
@@ -31,6 +32,9 @@ if type ccache > /dev/null 2>&1 ; then
     echo "enabling ccache"
     ARGS="$ARGS -DWITH_CCACHE=ON"
 fi
+if [ -n "$WITH_RADOSGW_AMQP_ENDPOINT" ] ; then
+    ARGS="$ARGS -DWITH_RADOSGW_AMQP_ENDPOINT=$WITH_RADOSGW_AMQP_ENDPOINT"
+fi
 
 mkdir build
 cd build