Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Mar 2002 11:21:00 +0200
From:      Ruslan Ermilov <ru@FreeBSD.org>
To:        "M. Warner Losh" <imp@village.org>, Mark Murray <markm@FreeBSD.org>
Cc:        current@FreeBSD.org
Subject:   Re: Bad fix for -current breakage
Message-ID:  <20020318092100.GE37136@sunbay.com>
In-Reply-To: <20020318.010200.125260984.imp@village.org>
References:  <20020318.010200.125260984.imp@village.org>

next in thread | previous in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020318092100.GE37136>