]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
do_cmake.sh: fix application of -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF 34008/head
authorNathan Cutler <ncutler@suse.com>
Tue, 17 Mar 2020 14:39:24 +0000 (15:39 +0100)
committerNathan Cutler <ncutler@suse.com>
Tue, 17 Mar 2020 14:47:14 +0000 (15:47 +0100)
50ba25b2aa4db34319a7b95e789065540347f895 broke do_cmake.sh in nautilus
and the backport of 46b3d671b4408a766aaed379274242ad4b38afb3 (which
was included in the same PR) did not fix it enough.

This commit cannot be backported from master. It is needed to fix
a partially broken backport.

After this commit is applied, the relevant part of do_cmake.sh in
nautilus will look exactly like it does now in master.

Fixes: 50ba25b2aa4db34319a7b95e789065540347f895
Fixes: https://tracker.ceph.com/issues/44641
Signed-off-by: Nathan Cutler <ncutler@suse.com>
do_cmake.sh

index fb06b9030c1d15bdf0dfee4fe7790daf3a9e69ed..ab8f5c8c9769ec86b2664de89540f56438538b3b 100755 (executable)
@@ -24,13 +24,13 @@ if [ -r /etc/os-release ]; then
       opensuse*|suse|sles)
           PYBUILD="3"
           ARGS+=" -DWITH_RADOSGW_AMQP_ENDPOINT=OFF"
-          WITH_RADOSGW_KAFKA_ENDPOINT="OFF"
+          ARGS+=" -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF"
           ;;
   esac
 elif [ "$(uname)" == FreeBSD ] ; then
   PYBUILD="3"
   ARGS+=" -DWITH_RADOSGW_AMQP_ENDPOINT=OFF"
-  WITH_RADOSGW_KAFKA_ENDPOINT="OFF"
+  ARGS+=" -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF"
 else
   echo Unknown release
   exit 1