[cpl-plugin-xsh] 01/03: Fix for Ubuntu FTBS

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-xsh.

commit dac8932bb4e12a0f596935b4815a0bf1da38587e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Nov 1 16:03:22 2013 +0100

    Fix for Ubuntu FTBS
---
 debian/patches/lapack.patch |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/patches/lapack.patch b/debian/patches/lapack.patch
index aa670d8..db2cf4a 100644
--- a/debian/patches/lapack.patch
+++ b/debian/patches/lapack.patch
@@ -13,15 +13,17 @@ Description: Replace clapack by lapack
  
      xsh_lapack_includes=""
      xsh_lapack_libraries=""
-@@ -100,7 +100,7 @@
+@@ -100,8 +100,8 @@
          LAPACK_LDFLAGS="-L$xsh_lapack_libraries"
          LDFLAGS="$LDFLAGS $LAPACK_LDFLAGS"
          CPPFLAGS="$CPPFLAGS $LAPACK_INCLUDES"
 -        AC_CHECK_LIB([clapack], [main], [LIBLAPACKC="-lclapack"], AC_MSG_ERROR([Library clapack not found]))
+-        LIBS="$LIBS $LIBLAPACKC"
 +        AC_CHECK_LIB([lapacke], [main], [LIBLAPACKC="-llapacke"], AC_MSG_ERROR([Library lapacke not found]))
-         LIBS="$LIBS $LIBLAPACKC"
++        LIBS="$LIBS $LIBLAPACKC -Wl,--no-as-needed"
          LIBLAPACK="$LIBLAPACKC"
      else
+         AC_MSG_RESULT([disabled])
 --- a/xsh/xsh_subtract_sky_single.c
 +++ b/xsh/xsh_subtract_sky_single.c
 @@ -67,8 +67,7 @@
@@ -53,12 +55,12 @@ Description: Replace clapack by lapack
 -      integer ldab=ord;
 -      integer ldb=ncoeffs;
 -      integer info=0;
-+      int clpk_n=ncoeffs;
-+      int kd=ord_minus_1;
-+      int nrhs=1;
-+      int ldab=ord;
-+      int ldb=ncoeffs;
-+      int info=0;
++      lapack_int clpk_n=ncoeffs;
++      lapack_int kd=ord_minus_1;
++      lapack_int nrhs=1;
++      lapack_int ldab=ord;
++      lapack_int ldb=ncoeffs;
++      lapack_int info=0;
  #endif
  
        /* Fill the basis function (Bn) and flux (y) matrices for the fitted lambda, 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-xsh.git