[Debian-astro-commits] [iraf] 01/02: Don't explicitly link to ncurses

[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 422b513dad8de6692abed959420dc2cacb0c5987
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Dec 14 08:37:30 2017 +0100

    Don't explicitly link to ncurses
---
 .../patches/Use-system-libraries-when-possible.patch  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/patches/Use-system-libraries-when-possible.patch b/debian/patches/Use-system-libraries-when-possible.patch
index 651a54d..5864699 100644
--- a/debian/patches/Use-system-libraries-when-possible.patch
+++ b/debian/patches/Use-system-libraries-when-possible.patch
@@ -8,11 +8,28 @@ 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.
 ---
+ pkg/ecl/mkpkg      | 4 ++--
  test/files.md      | 2 --
  unix/boot/spp/xc.c | 2 +-
  vendor/mklibs      | 4 ++--
- 3 files changed, 3 insertions(+), 5 deletions(-)
+ 4 files changed, 5 insertions(+), 7 deletions(-)
 
+diff --git a/pkg/ecl/mkpkg b/pkg/ecl/mkpkg
+index 0ad90de..7a8351c 100644
+--- a/pkg/ecl/mkpkg
++++ b/pkg/ecl/mkpkg
+@@ -69,9 +69,9 @@ link:
+ 	$set	LIBS = "-lc -lcur -lds -lstg"
+ 	$ifneq (MACH, sparc) then
+ 	  $ifeq (MACH, linux) then
+-	    $set	LIBS2 = "-/L/usr/lib32 -lreadline -lncurses"
++	    $set	LIBS2 = "-lreadline"
+ 	  $else
+-	    $set	LIBS2 = "-lreadline -lncurses"
++	    $set	LIBS2 = "-lreadline"
+ 	  $endif
+ 	$else
+ 	$set	LIBS2 = ""
 diff --git a/test/files.md b/test/files.md
 index cd5bb0c..1684d2e 100644
 --- a/test/files.md

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