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

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	liboil.spec 
Log Message:
* Fri Sep 07 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-11
- Revert the previous commit, it's still broken, see:
  http://koji.fedoraproject.org/koji/taskinfo?taskID=151172



Index: liboil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- liboil.spec	30 Aug 2007 13:36:23 -0000	1.21
+++ liboil.spec	7 Sep 2007 13:21:28 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.12
-Release: 10%{?dist}
+Release: 11%{?dist}
 # See COPYING which details everything, various BSD licenses apply
 License: BSD
 Group: System Environment/Libraries
@@ -11,7 +11,12 @@
 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
+# 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
 
 # Fix SIGILL handling for CPU tests
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179
@@ -51,10 +56,10 @@
 %patch4 -p0 -b .altivec2
 popd
 
-# 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
+# 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
 
 %build
 %configure
@@ -98,6 +103,10 @@
 
 
 %changelog
+* Fri Sep 07 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-11
+- Revert the previous commit, it's still broken, see:
+  http://koji.fedoraproject.org/koji/taskinfo?taskID=151172
+
 * 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