From a40c42bd4838fb65f890e4a9abe8105b4c4a4e24 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Tue, 17 Mar 2020 15:39:24 +0100 Subject: [PATCH] do_cmake.sh: fix application of -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF 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 --- do_cmake.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/do_cmake.sh b/do_cmake.sh index fb06b9030c1d1..ab8f5c8c9769e 100755 --- a/do_cmake.sh +++ b/do_cmake.sh @@ -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 -- 2.39.5