From owner-freebsd-current Fri Aug 17 4: 9:37 2001 Delivered-To: freebsd-current@freebsd.org Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by hub.freebsd.org (Postfix) with ESMTP id 4C6C037B40C; Fri, 17 Aug 2001 04:09:19 -0700 (PDT) (envelope-from ru@whale.sunbay.crimea.ua) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.2/8.11.2) id f7HB9CY91161; Fri, 17 Aug 2001 14:09:12 +0300 (EEST) (envelope-from ru) Date: Fri, 17 Aug 2001 14:09:12 +0300 From: Ruslan Ermilov To: Maxim Sobolev Cc: current@freebsd.org Subject: Re: 4-STABLE-->5-CURRENT upgrade path is b0rken in libform [patch] Message-ID: <20010817140912.B88339@sunbay.com> References: <200108171021.f7HALxG16809@vega.vega.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200108171021.f7HALxG16809@vega.vega.com>; from sobomax@freebsd.org on Fri, Aug 17, 2001 at 01:21:59PM +0300 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, Aug 17, 2001 at 01:21:59PM +0300, Maxim Sobolev wrote: > Hi, > > Currently 4-STABLE --> 5-CURRENT upgrade path is broken in libform > because it uses older curses.h header from the host system, which > misses some macros necessary. Attached patch is expected to fix the > problem, please review it and let me know if it is OK to commit it. > Are you sure? 1. We currently run `buildworld' with -nostdinc, so /usr/include (unless explicitly specified by CFLAGS) headers aren't used. 2. `make includes' is executed first, before `make libraries' in `buildworld', and the former installs the correct curses.h into /usr/obj/usr/src/i386/usr/include. 3. I can't reproduce your problem on my dual 4.4-PREPELEASE and 5.0-CURRENT box. I can only imagine this scenario if you try to execure `make all' from src/lib/libform manually. > Index: Makefile > =================================================================== > RCS file: /home/ncvs/src/lib/libform/Makefile,v > retrieving revision 1.6 > diff -d -u -r1.6 Makefile > --- Makefile 2001/03/27 17:27:01 1.6 > +++ Makefile 2001/08/17 10:16:24 > @@ -21,8 +21,9 @@ > INCS= ${NCURSES}/form/form.h > > CLEANFILES+= ncurses_def.h > -CFLAGS+= -I. -I${.CURDIR}/../libncurses -I${NCURSES}/form -I${NCURSES}/menu \ > - -I${NCURSES}/include -Wall -DNDEBUG -DHAVE_CONFIG_H > +CFLAGS+= -I. -I${.CURDIR}/../libncurses -I${.OBJDIR}/../libncurses \ > + -I${NCURSES}/form -I${NCURSES}/menu -I${NCURSES}/include \ > + -Wall -DNDEBUG -DHAVE_CONFIG_H > > ncurses_def.h: MKncurses_def.sh ncurses_defs > AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \ Cheers, -- Ruslan Ermilov Oracle Developer/DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message