[nanobsd] Build failure on RELENG_6 bin/11420

[Henrik Brix Andersen]

On Sun, Jul 01, 2007 at 07:01:35PM -0600, M. Warner Losh wrote:
> In message: <20070701233235.GA875 at tirith.brixandersen.dk>
>             Henrik Brix Andersen <henrik at brixandersen.dk> writes:
...
> : [1]: http://www.freebsd.org/cgi/query-pr.cgi?pr=114200
> 
> This patch is incorrect.
> 
> +.if !defined(NO_INSTALLLIB)
> 
> should be
> 
> +.if ${MK_INSTALLIB} != "no"

Oh - thanks for catching this. I guess the same change should be done
in lib/ncurses/ncurses/Makefile, then?

Here's an updated patch:

--- usr.bin/lex/lib/Makefile.orig	2007-07-02 01:06:20.000000000 +0200
+++ usr.bin/lex/lib/Makefile	2007-07-02 10:41:47.000000000 +0200
@@ -6,8 +6,10 @@
 SRCS=   libmain.c libyywrap.c
 NO_PIC=
 
+.if ${MK_INSTALLLIB} != "no"
 LINKS=  ${LIBDIR}/libln.a ${LIBDIR}/libl.a
 LINKS+=	${LIBDIR}/libln.a ${LIBDIR}/libfl.a
+.endif
 
 .if ${MK_PROFILE} != "no"
 LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libl_p.a


And for good meassure - a patch for lib/ncurses/ncurses/Makefile:

--- lib/ncurses/ncurses/Makefile.orig	2007-07-02 10:43:17.000000000 +0200
+++ lib/ncurses/ncurses/Makefile	2007-07-02 10:44:14.000000000 +0200
@@ -280,7 +280,7 @@
 INCSLINKS=	curses.h ${INCLUDEDIR}/ncurses.h
 .endif
 
-.if !defined(NO_INSTALLLIB)
+.if ${MK_INSTALLLIB} != "no"
 SYMLINKS+=	libncurses${LIB_SUFFIX}.a ${LIBDIR}/libcurses${LIB_SUFFIX}.a
 SYMLINKS+=	libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermcap${LIB_SUFFIX}.a
 SYMLINKS+=	libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermlib${LIB_SUFFIX}.a


-- 
Henrik Brix Andersen <henrik at brixandersen.dk>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 209 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-embedded/attachments/20070702/a078ba44/attachment.pgp