[ustl/el6: 3/3] Merge branch 'master' into f20

[Christopher Meng]

commit e6476df6bcae491333aebc02bd0227f41174dede
Merge: c198807 0376a4e
Author: Christopher Meng <i at cicku.me>
Date:   Fri Aug 8 16:57:55 2014 +0800

    Merge branch 'master' into f20
    
    Conflicts:
    	ustl.spec

 ustl.spec |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)
---
diff --cc ustl.spec
index 2ca9c1d,9c2627c..aa7f3e4
--- a/ustl.spec
+++ b/ustl.spec
@@@ -48,9 -48,18 +48,18 @@@ sed -i -e 's|/usr/lib|%{_libdir}|g
         -e 's|CXXFLAGS	:=|override CXXFLAGS	+=|g'  \
         Config.mk.in
  
+ # Do not interfere with optflags
+ sed -i -e 's|-march=native||g' configure
+ 
  %build
- ./configure --with-libstdc++ --force-inline --prefix=%{buildroot}%{_prefix}
+ ./configure \
+   --prefix=%{buildroot}%{_prefix} \
+ %ifarch %{ix86}
+   --without-mmx \
+ %endif
+   --with-libstdc++ --force-inline
+ 
 -%make_build CXXFLAGS+="%{optflags}"
 +make %{?_smp_mflags} CXXFLAGS+="%{optflags}"
  
  %install
  %make_install LIBDIR="%{buildroot}%{_libdir}"