[gdal] Ignore for the moment the test for armadillo (to be removed after gcc 4.7.2 release)
jamatos
jamatos at fedoraproject.org
Sun Jul 29 21:17:10 UTC 2012
commit 9bff36d0eb59c03c71cdfe640579a8bb82f934e8
Author: José Matos <jamatos at fedoraproject.org>
Date: Sun Jul 29 22:17:00 2012 +0100
Ignore for the moment the test for armadillo (to be removed after gcc 4.7.2 release)
gdal.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gdal.spec b/gdal.spec
index 7c0289c..3f5e468 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -318,7 +318,7 @@ done
# due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53549
# configure interprets the result as an error so ignore it
# this patch can/should be removed after gcc 4.7.2 is released
-sed -i 's|HAVE_ARMADILLO=$HAVE_ARMADILLO|HAVE_ARMADILLO=yes|' configure
+sed -i 's|if test -z "`${CXX} testarmadillo.cpp -o testarmadillo -larmadillo 2>&1`"|if 1|' configure
# Build with fPIC to allow Ruby bindings
# Xcompiler should normally achieve that -- http://trac.osgeo.org/gdal/ticket/3978
@@ -796,7 +796,7 @@ rm -rf %{buildroot}
%changelog
* Sun Jul 29 2012 José Matos <jamatos at fedoraproject.org> - 1.9.1-9
-- Ignore for the moment the test for armadillo
+- Ignore for the moment the test for armadillo (to be removed after gcc 4.7.2 release)
* Fri Jul 27 2012 José Matos <jamatos at fedoraproject.org> - 1.9.1-8
- Rebuild for new armadillo
More information about the scm-commits
mailing list