From 52dcaf9211f7648dc55e40d5a71db76dc8f6bd0e Mon Sep 17 00:00:00 2001 From: Stuart Henderson Date: Wed, 14 Nov 2018 20:43:49 +0000 Subject: Record an inter-library dependency on libcurses in libedit and libreadline, avoiding runtime failures on architectures using ld.lld. Also add a note to libcurses shlib_version reminding about bumps (as done with libcrypto/libssl). Thanks guenther@ for suggestions of tests involving library bumps and jca@ for doing these tests and hint about DPADD. Looks good kettenis@, ok jca@ --- lib/libedit/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/libedit') diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile index 4367f497653..0aea2d4ae31 100644 --- a/lib/libedit/Makefile +++ b/lib/libedit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2017/10/17 19:31:56 naddy Exp $ +# $OpenBSD: Makefile,v 1.31 2018/11/14 20:43:48 sthen Exp $ # $NetBSD: Makefile,v 1.41 2010/02/03 15:34:43 roy Exp $ # @(#)Makefile 8.1 (Berkeley) 6/4/93 @@ -11,6 +11,9 @@ SRCS = chared.c chartype.c common.c el.c eln.c emacs.c filecomplete.c \ MAN= editline.3 editrc.5 editline.7 +LDADD+= -L${BSDOBJDIR}/lib/libcurses -ltermcap +DPADD+= ${LIBTERMCAP} + LIBEDITDIR?=${.CURDIR} INCS= histedit.h -- cgit v1.2.3