From brix@lothlorien.brixandersen.dk Sun Jul 1 23:15:03 2007 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E537816A46B for ; Sun, 1 Jul 2007 23:14:56 +0000 (UTC) (envelope-from brix@lothlorien.brixandersen.dk) Received: from solow.pil.dk (relay.pil.dk [195.41.47.164]) by mx1.freebsd.org (Postfix) with ESMTP id B0AA513C469 for ; Sun, 1 Jul 2007 23:14:56 +0000 (UTC) (envelope-from brix@lothlorien.brixandersen.dk) Received: from lothlorien.brixandersen.dk (osgiliath.brixandersen.dk [87.53.223.189]) by solow.pil.dk (Postfix) with ESMTP id 4E1C31CC0E0 for ; Mon, 2 Jul 2007 01:14:55 +0200 (CEST) Received: by lothlorien.brixandersen.dk (Postfix, from userid 1001) id 8ED751142D; Mon, 2 Jul 2007 01:14:54 +0200 (CEST) Message-Id: <20070701231454.8ED751142D@lothlorien.brixandersen.dk> Date: Mon, 2 Jul 2007 01:14:54 +0200 (CEST) From: Henrik Brix Andersen Reply-To: Henrik Brix Andersen To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: [patch] 'make NO_INSTALLLIB=1 installworld' fails in usr.bin/lex/lib X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 114200 >Category: bin >Synopsis: [patch] 'make NO_INSTALLLIB=1 installworld' fails in usr.bin/lex/lib >Confidential: no >Severity: non-critical >Priority: medium >Responsible: ru >State: closed >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Jul 01 23:20:04 GMT 2007 >Closed-Date: Tue Oct 23 15:51:41 UTC 2007 >Last-Modified: Tue Oct 23 16:50:00 UTC 2007 >Originator: Henrik Brix Andersen >Release: FreeBSD 7.0-CURRENT i386 >Organization: pil.dk >Environment: System: FreeBSD lothlorien.brixandersen.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #47: Sun Jul 1 22:08:49 CEST 2007 root@lothlorien.brixandersen.dk:/usr/obj/usr/src/sys/LOTHLORIEN i386 >Description: With a fresh -current, 'make NO_INSTALLLIB=1 installworld' fails in usr.bin/lex/lib with the following error: ===> usr.bin/lex/lib (install) /usr/obj/nanobsd.osgiliath//_.w/usr/lib/libl.a -> /usr/obj/nanobsd.osgiliath//_.w/usr/lib/libln.a ln: /usr/obj/nanobsd.osgiliath//_.w/usr/lib/libln.a: No such file or directory *** Error code 1 1 error *** Error code 2 1 error *** Error code 2 1 error *** Error code 2 1 error *** Error code 2 1 error *** Error code 2 1 error *** Error code 2 1 error >How-To-Repeat: make NO_INSTALLLIB=1 installworld >Fix: The patch below fixes this issue by only attempting to create the links if NO_INSTALLLIB isn't specified. --- lex.diff begins here --- --- usr.bin/lex/lib/Makefile.orig 2007-07-02 00:47:03.000000000 +0200 +++ usr.bin/lex/lib/Makefile 2007-07-02 00:49:36.000000000 +0200 @@ -6,8 +6,10 @@ SRCS= libmain.c libyywrap.c NO_PIC= +.if !defined(NO_INSTALLLIB) 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 --- lex.diff ends here --- >Release-Note: >Audit-Trail: Adding to audit trail from misfiled PR bin/114202: Date: Sun, 01 Jul 2007 19:01:35 -0600 (MDT) From: "M. Warner Losh" In message: <20070701233235.GA875@tirith.brixandersen.dk> Henrik Brix Andersen writes: > I have just submitted a patch for fixing this issue - see bin/114200 [1]. > > Regards, > Brix > > [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" Warner Adding to audit trail from misfiled PR bin/114211: Date: Mon, 2 Jul 2007 10:47:57 +0200 From: Henrik Brix Andersen 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 Adding to audit trail from ports/11420: From: "M. Warner Losh" To: henrik@brixandersen.dk Cc: freebsd-embedded@freebsd.org, bug-followup@freebsd.org, ru@freebsd.org Subject: Re: bin/11420 [nanobsd] Build failure on RELENG_6 Date: Mon, 02 Jul 2007 07:47:21 -0600 (MDT) In message: <20070702084757.GA8274@tirith.brixandersen.dk> Henrik Brix Andersen writes: : Oh - thanks for catching this. I guess the same change should be done : in lib/ncurses/ncurses/Makefile, then? I belive so. I've CC'd ru@ to make sure. Warner From: Henrik Brix Andersen To: "M. Warner Losh" Cc: freebsd-embedded@freebsd.org, bug-followup@freebsd.org, ru@freebsd.org Subject: Re: bin/11420 [nanobsd] Build failure on RELENG_6 Date: Tue, 16 Oct 2007 00:37:54 +0200 Any updates on this? It would be nice to have this install problem fixed before 7.0-RELEASE. Regards, Brix -- Henrik Brix Andersen From: Henrik Brix Andersen To: bug-followup@FreeBSD.org Cc: "M. Warner Losh" Subject: bin/114200: [patch] 'make NO_INSTALLLIB=1 installworld' fails in usr.bin/lex/lib Date: Tue, 16 Oct 2007 11:51:49 +0200 In order for the '.if ${MK_INSTALLLIB} != "no"' solution proposed by Warner to work, this patch is needed: --- share/mk/bsd.own.mk.orig 2007-10-16 01:00:45.000000000 +0200 +++ share/mk/bsd.own.mk 2007-10-16 01:01:47.000000000 +0200 @@ -188,6 +188,7 @@ COMPRESS_EXT?= .gz # regardless of user's setting). # .for var in \ + INSTALLLIB \ MAN \ PROFILE .if defined(NO_${var}) @@ -322,6 +323,7 @@ WITH_IDEA= I4B \ INET6 \ INFO \ + INSTALLLIB \ IPFILTER \ IPX \ KERBEROS \ --- usr.bin/lex/lib/Makefile.orig 2006-03-18 22:37:05.000000000 +0100 +++ usr.bin/lex/lib/Makefile 2007-10-16 00:58:06.000000000 +0200 @@ -6,8 +6,10 @@ LIB= ln 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 --- lib/ncurses/ncurses/Makefile.orig 2007-10-16 00:58:33.000000000 +0200 +++ lib/ncurses/ncurses/Makefile 2007-10-16 00:59:03.000000000 +0200 @@ -280,7 +280,7 @@ INCS= ${HEADERS} ${SRCHDRS} 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 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: bin/114200: commit references a PR Date: Sat, 20 Oct 2007 19:02:03 +0000 (UTC) ru 2007-10-20 19:01:50 UTC FreeBSD src repository Modified files: share/mk bsd.lib.mk bsd.own.mk lib/libpam/modules/pam_unix Makefile lib/ncurses/ncurses Makefile usr.bin/lex/lib Makefile Log: - Convert NO_INSTALLLIB option to a new syntax: makefiles should test MK_INSTALLLIB, users can set WITHOUT_INSTALLLIB. The old NO_INSTALLLIB is still supported as several makefiles set it. - While here, fix an install when instructed not to install libs (usr.bin/lex/lib/Makefile). PR: bin/114200 Submitted by: Henrik Brix Andersen Revision Changes Path 1.22 +1 -0 src/lib/libpam/modules/pam_unix/Makefile 1.93 +1 -1 src/lib/ncurses/ncurses/Makefile 1.183 +1 -1 src/share/mk/bsd.lib.mk 1.69 +2 -0 src/share/mk/bsd.own.mk 1.11 +2 -0 src/usr.bin/lex/lib/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" State-Changed-From-To: open->closed State-Changed-By: ru State-Changed-When: Tue Oct 23 15:50:56 UTC 2007 State-Changed-Why: Fixed in 8.0-CURRENT and 7.0-BETA1. Responsible-Changed-From-To: freebsd-bugs->ru Responsible-Changed-By: ru Responsible-Changed-When: Tue Oct 23 15:50:56 UTC 2007 Responsible-Changed-Why: http://www.freebsd.org/cgi/query-pr.cgi?pr=114200 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: bin/114200: commit references a PR Date: Tue, 23 Oct 2007 16:41:13 +0000 (UTC) ru 2007-10-23 15:41:34 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) lib/libpam/modules/pam_unix Makefile lib/ncurses/ncurses Makefile share/mk bsd.lib.mk bsd.own.mk usr.bin/lex/lib Makefile Log: MFC: Added MK_INSTALLLIB support and fixed usr.bin/lex/lib/Makefile in case of installing with WITHOUT_INSTALLLIB (e.g. in nanobsd(8)). PR: bin/114200 Approved by: re (kensmith) Revision Changes Path 1.21.2.1 +1 -0 src/lib/libpam/modules/pam_unix/Makefile 1.92.2.1 +1 -1 src/lib/ncurses/ncurses/Makefile 1.182.2.1 +1 -1 src/share/mk/bsd.lib.mk 1.67.2.2 +2 -0 src/share/mk/bsd.own.mk 1.10.2.1 +2 -0 src/usr.bin/lex/lib/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: