[Debian-astro-commits] [iraf] 01/02: Use local lapack

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository iraf.

commit cecb4b0c54830e5102b9fa6a1a8f1750789c71f5
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Nov 29 17:40:01 2017 +0100

    Use local lapack
    
    IRAF cannot use a pre-compiled one, since it uses the ILP64 memory
    model (integer is 8 byte), while the precompiled lapack uses the
    normal LP64 model (integer is 4 byte). Therefore, the int arrays are
    not compatible.
---
 debian/control                                     |  1 -
 .../Make-the-installation-FHS-conform.patch        |  4 +--
 .../Use-system-libraries-when-possible.patch       | 41 +++++++---------------
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/debian/control b/debian/control
index 1f3843b..93ec53b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Build-Depends: debhelper (>= 9),
                libcfitsio-dev,
                libcurl4-gnutls-dev,
                libexpat1-dev,
-               liblapack-dev,
                libncurses5-dev,
                libreadline-dev
 Section: science
diff --git a/debian/patches/Make-the-installation-FHS-conform.patch b/debian/patches/Make-the-installation-FHS-conform.patch
index 3e9e37c..decb132 100644
--- a/debian/patches/Make-the-installation-FHS-conform.patch
+++ b/debian/patches/Make-the-installation-FHS-conform.patch
@@ -103,7 +103,7 @@ index ee1aeae..7e927c9 100644
  
  	} else {
 diff --git a/test/files.md b/test/files.md
-index 17293ef..240b97b 100644
+index 755104c..f703377 100644
 --- a/test/files.md
 +++ b/test/files.md
 @@ -28,30 +28,30 @@ bin$x_vol.e
@@ -161,7 +161,7 @@ index 17293ef..240b97b 100644
  ```
  
  # Libraries
-@@ -89,44 +89,44 @@ bin$libxtools.a
+@@ -90,44 +90,44 @@ bin$libxtools.a
  ```
  
  ```
diff --git a/debian/patches/Use-system-libraries-when-possible.patch b/debian/patches/Use-system-libraries-when-possible.patch
index 3be9bad..0091fbc 100644
--- a/debian/patches/Use-system-libraries-when-possible.patch
+++ b/debian/patches/Use-system-libraries-when-possible.patch
@@ -2,29 +2,19 @@ From: Ole Streicher <olebole at debian.org>
 Date: Wed, 22 Nov 2017 13:13:12 +0100
 Subject: Use system libraries when possible
 
-This includes lapack, cfitsio, readline.
+This includes cfitsio and readline.
 curl and expat are already handled upstream.
+
+Lapack cannot be replaced, since IRAF uses a memory model (ILP64;
+integers are 8 byte long) that is not used by lapack.
 ---
- math/mkpkg         | 1 -
- test/files.md      | 3 ---
- unix/boot/spp/xc.c | 4 ++--
+ test/files.md      | 2 --
+ unix/boot/spp/xc.c | 2 +-
  vendor/mklibs      | 4 ++--
- 4 files changed, 4 insertions(+), 8 deletions(-)
+ 3 files changed, 3 insertions(+), 5 deletions(-)
 
-diff --git a/math/mkpkg b/math/mkpkg
-index 403aa1f..69c7716 100644
---- a/math/mkpkg
-+++ b/math/mkpkg
-@@ -22,7 +22,6 @@ mathgen:
- 	$call nlfit
- 	$call slalib
- 	$call surfit
--	$call lapack
- 	$call fftpack
- 	$purge lib$
- 	;
 diff --git a/test/files.md b/test/files.md
-index ad01607..17293ef 100644
+index ad01607..755104c 100644
 --- a/test/files.md
 +++ b/test/files.md
 @@ -61,7 +61,6 @@ cl> dir bin$*.a ncol=1
@@ -35,12 +25,7 @@ index ad01607..17293ef 100644
  bin$libcur.a
  bin$libcurfit.a
  bin$libdeboor.a
-@@ -75,12 +74,10 @@ bin$libimd.a
- bin$libimfort.a
- bin$libiminterp.a
- bin$libinterp.a
--bin$liblapack.a
- bin$libllsq.a
+@@ -80,7 +79,6 @@ bin$libllsq.a
  bin$libmemdbg.a
  bin$libncar.a
  bin$libnlfit.a
@@ -49,20 +34,18 @@ index ad01607..17293ef 100644
  bin$libslalib.a
  bin$libstg.a
 diff --git a/unix/boot/spp/xc.c b/unix/boot/spp/xc.c
-index 61a3145..09b075f 100644
+index 61a3145..3098425 100644
 --- a/unix/boot/spp/xc.c
 +++ b/unix/boot/spp/xc.c
-@@ -70,8 +70,8 @@
+@@ -70,7 +70,7 @@
  #define IRAFLIB3	"libvops.a"
  #define IRAFLIB4	"libos.a"
  #define IRAFLIB5	"libVOTable.a"
 -#define IRAFLIB6	"libcfitsio.a"
--#define IRAFLIB7	"liblapack.a"
 +#define IRAFLIB6	"-lcfitsio"
-+#define IRAFLIB7	"-llapack"
+ #define IRAFLIB7	"liblapack.a"
  
  char *fortlib[] = { "-lf2c",			/*  0  (host progs) */
- 		    "-lf2c",			/*  1  */
 diff --git a/vendor/mklibs b/vendor/mklibs
 index 286468e..a73dac0 100755
 --- a/vendor/mklibs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/iraf.git