]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
build/ops: rpm: explicitly provide --with-ocf to configure
authorNathan Cutler <ncutler@suse.com>
Fri, 7 Apr 2017 04:48:51 +0000 (06:48 +0200)
committerNathan Cutler <ncutler@suse.com>
Fri, 7 Apr 2017 05:05:20 +0000 (07:05 +0200)
Fixes: http://tracker.ceph.com/issues/19546
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(Note: This cannot be cherry-picked because master uses cmake, but
the fix does bring the jewel spec file into better alignment its master
counterpart, at least as far as this one little bit is concerned.)

ceph.spec.in

index 38d7e9ccf0816b44132877d3f17463bd43314230..82b20515dbf388232e2f17bb50f265963b17b14e 100644 (file)
@@ -668,7 +668,9 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
                --without-babeltrace \
 %endif
                $CEPH_EXTRA_CONFIGURE_ARGS \
-               %{?_with_ocf} \
+%if 0%{with ocf}
+               --with-ocf \
+%endif
 %if %{without tcmalloc}
                --without-tcmalloc \
 %endif