Skip to content

Commit

Permalink
Don't try to detect TERMCAP_LIB, let BROKEN_READLINE_DETECTION tell
Browse files Browse the repository at this point in the history
us. Fixes at least Ubuntu builds. Tested on Ubuntu 16, NetBSD 8,
macOS 10.14.
  • Loading branch information
schmonz committed Aug 29, 2019
1 parent a3ba942 commit 3906ce2
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
4 changes: 3 additions & 1 deletion devel/p5-Term-ReadLine/Makefile
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.52 2019/08/11 13:20:25 wiz Exp $
# $NetBSD: Makefile,v 1.53 2019/08/29 19:45:07 schmonz Exp $

DISTNAME= Term-ReadLine-Gnu-1.36
PKGNAME= p5-${DISTNAME:S/-Gnu//}
Expand All @@ -17,6 +17,8 @@ MAKE_PARAMS+= --prefix=${BUILDLINK_PREFIX.readline}

WRKSRC= ${WRKDIR}/${DISTNAME:C/a$//}

BROKEN_READLINE_DETECTION= yes

REPLACE_PERL+= Gnu/XS.pm

.include "../../devel/readline/buildlink3.mk"
Expand Down
3 changes: 2 additions & 1 deletion devel/p5-Term-ReadLine/distinfo
@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.21 2019/01/26 07:42:00 wen Exp $
$NetBSD: distinfo,v 1.22 2019/08/29 19:45:07 schmonz Exp $

SHA1 (Term-ReadLine-Gnu-1.36.tar.gz) = 1c79b6b2f9b1256313b5bf262682e42ecf9d13ea
RMD160 (Term-ReadLine-Gnu-1.36.tar.gz) = 4f7b090100a108e22f763931f334ff6911640c98
SHA512 (Term-ReadLine-Gnu-1.36.tar.gz) = be576c45808744b9e6ae703ba170fc19f8cc4a63e6c8d74486159ff44c6763815bded11c7a414a491553e82041da2e4c5f197785e91a461118b4efa7fde240e9
Size (Term-ReadLine-Gnu-1.36.tar.gz) = 128336 bytes
SHA1 (patch-Makefile.PL) = 77076432207d0143f9707098ec975d8972de68c5
15 changes: 15 additions & 0 deletions devel/p5-Term-ReadLine/patches/patch-Makefile.PL
@@ -0,0 +1,15 @@
$NetBSD: patch-Makefile.PL,v 1.1 2019/08/29 19:45:07 schmonz Exp $

Don't try to detect TERMCAP_LIB. Fixes at least Ubuntu builds.

--- Makefile.PL.orig 2017-11-25 13:50:24.000000000 +0000
+++ Makefile.PL
@@ -87,7 +87,7 @@ if ($Config{osname} eq 'os2') {
|| &search_lib('-lncurses')
|| &search_lib('-lcurses');

- unless ($TERMCAP_LIB) {
+ unless (1 || $TERMCAP_LIB) {
warn "Could not find neither libtermcap, libtinfo, libncurses, or libcurses.\n";
exit $err;
}

0 comments on commit 3906ce2

Please sign in to comment.