don't override CFLAGS

leveldb adds -I flags to CFLAGS and CXXFLAGS, but if these macros are
overridden in the make command line, the flags are dropped, and the
build fails.  leveldb should probably use AM_CFLAGS instead, but the
spec file can specify the preferred CFLAGS in the configure command
line, and then everything will work as expected.

Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index b8b2d1fd227f3879135eb5cff090398ec6232312..e5df113bf67a5f9d51bb57ea6176ea485ecc7515 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -217,6 +217,8 @@ MY_CONF_OPT="$MY_CONF_OPT --with-gtk2"
 MY_CONF_OPT="$MY_CONF_OPT --without-gtk2"
 %endif
 
+export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
+
 # be explicit about --with/without-tcmalloc because the
 # autoconf default differs from what's needed for rpm
 %{configure}   --prefix=/usr \
@@ -227,7 +229,8 @@ MY_CONF_OPT="$MY_CONF_OPT --without-gtk2"
                --without-hadoop \
                $MY_CONF_OPT \
                %{?_with_ocf} \
-               %{?with_tcmalloc:--with-tcmalloc} %{!?with_tcmalloc:--without-tcmalloc}
+               %{?with_tcmalloc:--with-tcmalloc} %{!?with_tcmalloc:--without-tcmalloc} \
+               CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 
 # fix bug in specific version of libedit-devel
 %if 0%{defined suse_version}
@@ -236,9 +239,7 @@ sed -i -e "s/-lcurses/-lncurses/g" src/Makefile
 sed -i -e "s/-lcurses/-lncurses/g" man/Makefile
 %endif
 
-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"
+make -j$(getconf _NPROCESSORS_ONLN)
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install