rpms/liboil/devel liboil.spec,1.20,1.21

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/liboil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17257

Modified Files:
	liboil.spec 
Log Message:
use altivec again


Index: liboil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- liboil.spec	23 Aug 2007 11:34:07 -0000	1.20
+++ liboil.spec	30 Aug 2007 13:36:23 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.12
-Release: 9%{?dist}
+Release: 10%{?dist}
 # See COPYING which details everything, various BSD licenses apply
 License: BSD
 Group: System Environment/Libraries
@@ -11,12 +11,7 @@
 Patch1: liboil-0.3.9-s390.patch
 # PPC64 isn't being detected properly
 # http://bugzilla.redhat.com/242418
-# Patch2: liboil-0.3.12-ppc64-configure.patch
-
-# Disable PPC altogether, as oil_prototype_from_string() crashes in malloc
-# otherwise
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c16
-Patch2: liboil-0.3.12-disable-altivec.patch
+Patch2: liboil-0.3.12-ppc64-configure.patch
 
 # Fix SIGILL handling for CPU tests
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179
@@ -56,10 +51,10 @@
 %patch4 -p0 -b .altivec2
 popd
 
-# Disable Altivec, so that liboil doesn't SIGILL on non-Altivec PPCs
-# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c15
-sed -i 's/CFLAGS="$CFLAGS "-maltivec""/CFLAGS="$CFLAGS "-fno-tree-vectorize -Wa,-maltivec""/' configure
-sed -i 's/LIBOIL_CFLAGS -maltivec/LIBOIL_CFLAGS -fno-tree-vectorize -Wa,-maltivec/' configure
+# Disable automatic use of Altivec by the compiler, so that liboil only
+# uses it when it's available.
+cp configure foo
+sed -i 's/\([^,]\)-maltivec/\1-Wa,-maltivec/' configure
 
 %build
 %configure
@@ -103,6 +98,10 @@
 
 
 %changelog
+* Thu Aug 30 2007 - David Woodhouse <dwmw2 at infradead.org> - 0.3.12-10
+- Re-enable explicit Altivec but don't let the compiler use it automatically
+- Start applying the ppc64-configure patch again
+
 * Thu Aug 23 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-9
 - Disable Altivec so we don't crash on non-Altivec PPCs, see
   https://bugzilla.redhat.com/bugzilla/process_bug.cgi#c16