From owner-freebsd-current Mon Mar 18 1:21:34 2002 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 7F69437B402; Mon, 18 Mar 2002 01:21:26 -0800 (PST) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.6/8.11.2) id g2I9L0e46370; Mon, 18 Mar 2002 11:21:00 +0200 (EET) (envelope-from ru) Date: Mon, 18 Mar 2002 11:21:00 +0200 From: Ruslan Ermilov To: "M. Warner Losh" , Mark Murray Cc: current@FreeBSD.org Subject: Re: Bad fix for -current breakage Message-ID: <20020318092100.GE37136@sunbay.com> References: <20020318.010200.125260984.imp@village.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020318.010200.125260984.imp@village.org> User-Agent: Mutt/1.3.27i 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 Mon, Mar 18, 2002 at 01:02:00AM -0700, M. Warner Losh wrote: > Note, a real fix would be applied to all the config.* files, and would > depend on the BOOTSTRAP symbol that we define during the early stages > of the build. This is my wimpy fix for people that want a quick fix > to the problem of building -current on -stable. > > Now, to the next breakage in the tree :-) > Here's a "good" one: %%% Index: Makefile.inc =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/perl/Makefile.inc,v retrieving revision 1.29 diff -u -r1.29 Makefile.inc --- Makefile.inc 16 Mar 2002 21:36:07 -0000 1.29 +++ Makefile.inc 18 Mar 2002 09:19:07 -0000 @@ -60,8 +60,14 @@ @ln -sf ${PERL5SRC}/writemain.SH writemain.sh @ln -sf ${PERL5SRC}/regcomp.c regcomp.c @ln -sf ${PERL5SRC}/regexec.c regexec.c +.if defined(BOOTSTRAPPING) + @sed '/^d_eaccess=/s;define;undef;' \ + ${PERL5LIBSRC}/config.SH-${OBJFORMAT}.${MACHINE_ARCH} \ + > config.sh +.else @ln -sf ${PERL5LIBSRC}/config.SH-${OBJFORMAT}.${MACHINE_ARCH} \ config.sh +.endif @touch ${.TARGET} scripts: links %%% Cheers, -- Ruslan Ermilov Sysadmin and 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