]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec: work around build.opensuse.org
authorSage Weil <sage@newdream.net>
Mon, 17 Oct 2011 15:50:54 +0000 (08:50 -0700)
committerSage Weil <sage@newdream.net>
Mon, 17 Oct 2011 15:50:54 +0000 (08:50 -0700)
The redhat-rpm-config isn't installed on build.opensuse.org, which means
the processor is set to i386 instead of something less ancient.  This
breaks compilation on 32-bit x86.

Kludge around it here.

Signed-off-by: Sage Weil <sage@newdream.net>
ceph.spec.in

index 26cc50fcb2331d8d671ca4f63fa609008fdbc607..a5f21d08eca6b052927078f0431a3d7c1ca44995 100644 (file)
@@ -129,6 +129,8 @@ MY_CONF_OPT="$MY_CONF_OPT --without-gtk2"
 --without-hadoop $MY_CONF_OPT \
 %{?with_tcmalloc:--with-tcmalloc} %{!?with_tcmalloc:--without-tcmalloc}
 
+export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
+
 make -j$(getconf _NPROCESSORS_ONLN) CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 
 %install