adjusted upstream patch to fix build with poppler 0.69.0

[packages/gdal.git] / gdal-armadillo.patch

diff --git a/gdal-armadillo.patch b/gdal-armadillo.patch
index 3a0a20d8434c5dad2602258ce691fb022ddf7c17..6824e3d8b5706d89ca88b0c47d7d947a66f3ac11 100644 (file)
--- a/gdal-armadillo.patch
+++ b/gdal-armadillo.patch
@@ -1,13 +1,12 @@
 Kill warnings in Armadillo detection code to make compiler output empty
---- gdal-1.11.0/configure.in.orig      2014-06-14 15:45:50.005039893 +0200
-+++ gdal-1.11.0/configure.in   2014-06-14 16:46:47.261630331 +0200
+--- gdal-1.11.0/configure.ac.orig      2014-06-14 15:45:50.005039893 +0200
++++ gdal-1.11.0/configure.ac   2014-06-14 16:46:47.261630331 +0200
 @@ -4227,7 +4227,7 @@
      rm -f testarmadillo.*
      rm -f testarmadillo
      echo '#include <armadillo>' > testarmadillo.cpp
 -    echo 'int main(int argc, char** argv) { arma::mat matInput(2,2); const arma::mat& matInv = arma::inv(matInput); return 0; } ' >> testarmadillo.cpp
--    if test -z "`${CXX} ${CPPFLAGS} testarmadillo.cpp -o testarmadillo -larmadillo ${LIBS} 2>&1`" ; then
 +    echo 'int main(int, char**) { arma::mat matInput(2,2); const arma::mat& matInv = arma::inv(matInput); (void)matInv; return 0; } ' >> testarmadillo.cpp
-+    if test -z "`${CXX} ${CPPFLAGS} testarmadillo.cpp -o testarmadillo -larmadillo 2>&1`" ; then
+     if test -z "`${CXX} ${CPPFLAGS} testarmadillo.cpp -o testarmadillo -larmadillo 2>&1`" ; then
          HAVE_ARMADILLO=yes
          LIBS="-larmadillo ${LIBS}"