diff options
| author |   sthen <sthen@openbsd.org> | 2018-11-14 20:43:48 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2018-11-14 20:43:48 +0000 |
| commit | b5769cf657399de4547d7e4bd1882c9ad226a9f2 (patch) | |
| tree | 37c8460001c9ef6aef87ef4b3bf12d3a49cc9a58 | |
| parent | Revert previous, it breaks regress. (diff) | |
| download | wireguard-openbsd-b5769cf657399de4547d7e4bd1882c9ad226a9f2.tar.xz wireguard-openbsd-b5769cf657399de4547d7e4bd1882c9ad226a9f2.zip | |
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@
| -rw-r--r-- | gnu/lib/libreadline/Makefile | 4 | ||||
| -rw-r--r-- | lib/libcurses/shlib_version | 1 | ||||
| -rw-r--r-- | lib/libedit/Makefile | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile index 621844f808a..d9604069c5b 100644 --- a/gnu/lib/libreadline/Makefile +++ b/gnu/lib/libreadline/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2004/08/09 16:53:15 pefo Exp $ +# $OpenBSD: Makefile,v 1.8 2018/11/14 20:43:48 sthen Exp $ LIB= readline SRCS= readline.c funmap.c keymaps.c vi_mode.c parens.c rltty.c complete.c \ @@ -10,6 +10,8 @@ HDRS= readline.h chardefs.h keymaps.h history.h tilde.h rlstdc.h rlconf.h \ rltypedefs.h SUBDIR= doc CPPFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} +LDADD+= -L${BSDOBJDIR}/lib/libcurses -ltermcap +DPADD+= ${LIBTERMCAP} includes: ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ diff --git a/lib/libcurses/shlib_version b/lib/libcurses/shlib_version index d85251eba7d..2b806bd3e47 100644 --- a/lib/libcurses/shlib_version +++ b/lib/libcurses/shlib_version @@ -1,2 +1,3 @@ +# Don't forget to give libedit and gnu/lib/libreadline the same type of bump! major=14 minor=0 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 |