Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'trac/u/mkoeppe/perl_term_readline_gnu__…
Browse files Browse the repository at this point in the history
…upgrade_to_1_35_and_patch_away_ncurses_problem' into t/24905/upgrade_polymake_to_version_3_2r2
  • Loading branch information
mkoeppe committed Apr 6, 2018
2 parents 196eb49 + 672a3a2 commit 0b818c3
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build/pkgs/perl_term_readline_gnu/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=Term-ReadLine-Gnu-VERSION.tar.gz
sha1=8052543fcdf3ab5ae44a385224d92b8337dd5125
md5=c3afcf3fc989b2c0a5b6676c65d3a58e
cksum=3006163947
sha1=1f57fe986d56c6afa5eb868ca36dc5f0f8dcc3b6
md5=514619d68bda1618da61b19d04b5cefe
cksum=677275902
2 changes: 1 addition & 1 deletion build/pkgs/perl_term_readline_gnu/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.34
1.35
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From e9fbab6c37a1955bdf44d8e7ab3fe125351e4aad Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Fri, 6 Apr 2018 15:17:41 -0500
Subject: [PATCH] Always use ncurses

---
Makefile.PL | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index ffd72c1..208aae0 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -74,22 +74,8 @@ if ($Config{osname} eq 'os2') {
}
}

- # Search libtermcap, libncurses, or libcurses in this order.
- # I emulate the behavior of the configure script for bash, and don't
- # know why AIX prefers curses.
- # libtermcap.a on HPUX cannot be used for dynamically linked binary.
- # Old Cygwin may require setting false (0).
- my $PREFER_CURSES = $Config{osname} eq 'aix' || $Config{osname} eq 'hpux'
- || $Config{osname} eq 'cygwin';
- my $TERMCAP_LIB = (! $PREFER_CURSES && &search_lib('-ltermcap'))
- || &search_lib('-lncurses')
- || &search_lib('-lcurses');
-
- unless ($TERMCAP_LIB) {
- warn "Could not find neither libtermcap.a, libncurses.a, or libcurses.\n";
- exit $err;
- }
-
+ my $TERMCAP_LIB = '-lncurses';
+
$libs = "-lreadline $TERMCAP_LIB";
# Latest Perl in FreeBSD does not need this hack. (Dec.2002)
$libs .= ' -lcrypt' if ($Config{osname} =~ /freebsd/i);
--
2.11.0

0 comments on commit 0b818c3

Please sign in to comment.