[pixman] Disable openmp patch in RHEL for the moment

Adam Jackson ajax at fedoraproject.org
Mon Jul 30 21:35:17 UTC 2012


commit 3aa4209e257fc93b506f3131b8a998b9a4d99c3c
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jul 30 17:34:54 2012 -0400

    Disable openmp patch in RHEL for the moment

 pixman.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/pixman.spec b/pixman.spec
index e0b286d..579c669 100644
--- a/pixman.spec
+++ b/pixman.spec
@@ -3,7 +3,7 @@
 
 Name:           pixman
 Version:        0.26.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries
@@ -34,13 +34,15 @@ Development library for pixman.
 
 %prep
 %setup -q
+%if !0%{?rhel}
 %patch1 -p1 -b .openmp
+%endif
 
 %build
 autoreconf -vif
-%configure --disable-static
+%configure --disable-static %{?rhel:--disable-openmp}
 
-make %{?_smp_mflags} V=1 CFLAGS="$CFLAGS -fopenmp -fno-strict-aliasing" LDFLAGS="$LDFLAGS -fopenmp"
+make %{?_smp_mflags} V=1 CFLAGS="$CFLAGS -fno-strict-aliasing"
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -62,6 +64,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Mon Jul 30 2012 Adam Jackson <ajax at redhat.com> 0.26.2-4
+- Disable openmp patch in RHEL for the moment
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.26.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list