From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 24 May 2017 07:58:40 +0000 (+0200)
Subject: build/ops: rpm: no rgw Beast frontend on s390x
X-Git-Tag: ses5-milestone5~2^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b3e261d082ea576ff9f5cdefffb2c5259ba3b43;p=ceph.git

build/ops: rpm: no rgw Beast frontend on s390x

Since the Beast frontend uses boost::context which is not supported on
s390x.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 84e80b74cf6320d50eea879131a34482f597c366)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 6d605d394ceb..7a7ac9edf444 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -24,8 +24,10 @@
 %bcond_with xio
 %ifarch s390 s390x
 %bcond_with tcmalloc
+%bcond_with rgw_beast
 %else
 %bcond_without tcmalloc
+%bcond_without rgw_beast
 %endif
 %bcond_without lowmem_builder
 %bcond_with minimal_debugging_information
@@ -867,6 +869,11 @@ cmake .. \
     $CEPH_EXTRA_CMAKE_ARGS \
 %if 0%{with ocf}
     -DWITH_OCF=ON \
+%endif
+%if 0%{with rgw_beast}
+    -DWITH_RADOSGW_BEAST_FRONTEND=ON \
+%else
+    -DWITH_RADOSGW_BEAST_FRONTEND=OFF \
 %endif
     -DBOOST_J=%{_smp_ncpus}