Date: Thu, 19 Sep 2002 17:35:52 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Peter Wemm <peter@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src Makefile src/usr.bin/make Makefile Message-ID: <20020919143552.GA88851@sunbay.com> In-Reply-To: <200208310718.g7V7Ifpt045306@freefall.freebsd.org> References: <200208310718.g7V7Ifpt045306@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--W/nzBZO5zC0uMSeA
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sat, Aug 31, 2002 at 12:18:40AM -0700, Peter Wemm wrote:
> peter 2002/08/31 00:18:40 PDT
>=20
> Modified files:
> . Makefile=20
> usr.bin/make Makefile=20
> Log:
> Deal with bootstrapping from an old -current (almost exactly a year old)
> which fails the make tests (doesn't understand ${notdef:U}) and therefo=
re
> fails on __FBSDID in usr.bin/make/*. -DBOOTSTRAPPING is no help here s=
ince
> this is before we are using the new share/mk/* files, and it would conf=
lict
> with the builtin -DBOOTSTRAPPING support later.. so use a different fla=
g.
> =20
> Revision Changes Path
> 1.264 +2 -1 src/Makefile
> 1.26 +3 -0 src/usr.bin/make/Makefile
>=20
But we should be using the new share/mk/* files here, similarly
like we use them when we build bootstrap-tools in Makefile.inc1.
%%%
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/Makefile,v
retrieving revision 1.265
diff -u -r1.265 Makefile
--- Makefile 17 Sep 2002 01:48:47 -0000 1.265
+++ Makefile 19 Sep 2002 14:16:46 -0000
@@ -102,6 +102,7 @@
=20
PATH=3D /sbin:/bin:/usr/sbin:/usr/bin
MAKE=3D PATH=3D${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1
+BMAKE=3D make -m ${.CURDIR}/share/mk -DBOOTSTRAPPING
=20
#
# Handle the user-driven targets, using the source relative mk files.
@@ -194,8 +195,8 @@
@echo " Upgrading the installed make"
@echo "--------------------------------------------------------------"
@cd ${.CURDIR}/usr.bin/make; \
- make obj && make -D_UPGRADING depend && \
- make -D_UPGRADING all && make install
+ ${BMAKE} obj && ${BMAKE} depend && \
+ ${BMAKE} all && ${BMAKE} install
=20
#
# Define the upgrade targets. These are listed here in alphabetical
Index: usr.bin/make/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/usr.bin/make/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- usr.bin/make/Makefile 17 Sep 2002 22:31:26 -0000 1.27
+++ usr.bin/make/Makefile 19 Sep 2002 14:16:46 -0000
@@ -16,9 +16,6 @@
NOSHARED?=3D YES
=20
CFLAGS+=3D-DMAKE_VERSION=3D\"5200209170\"
-.if defined(_UPGRADING)
-CFLAGS+=3D-D__FBSDID=3D__RCSID
-.endif
=20
main.o: ${MAKEFILE}
=20
%%%
OTOH, this creates a chicken-and-egg problem. make's makefile
may depend on new features of bsd.*.mk files, and new bsd.*.mk
files may depend on new features of make(1) like new modifiers
etc.
Cheers,
--=20
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
--W/nzBZO5zC0uMSeA
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (FreeBSD)
iD8DBQE9ieDIUkv4P6juNwoRAhkbAJ49WJPiwQ4adPitWPtPrbbhYd/CZQCfW5lo
Z+tBt6OEhy/gyt8oO/rciO0=
=E28R
-----END PGP SIGNATURE-----
--W/nzBZO5zC0uMSeA--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020919143552.GA88851>