Date: Mon, 24 Sep 2001 17:26:40 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Mark Murray <mark@grondar.za> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/gnu/usr.bin/perl Makefile Makefile.inc src/gnu/usr.bin/perl/utils Makefile.inc Message-ID: <20010924172640.B79120@sunbay.com> In-Reply-To: <200109221317.f8MDHhV14512@grimreaper.grondar.za>; from mark@grondar.za on Sat, Sep 22, 2001 at 02:17:42PM %2B0100 References: <20010922120750.F76391@sunbay.com> <200109221317.f8MDHhV14512@grimreaper.grondar.za>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Here, with a slightly updated patch (attached),
> o make release
>
Will test it tonight, though it doesn't differ from the usual
"buildworld" in this case. But just because you asked, I'll
just do it. :-)
> o make buildworld
>
--------------------------------------------------------------
>>> elf make world completed on Mon Sep 24 17:05:39 EEST 2001
(started Mon Sep 24 15:55:20 EEST 2001)
--------------------------------------------------------------
This was a -CURRENT "make world" run on -STABLE box with DESTDIR=/CURRENT.
> o the usual combinations of "make obj && make depend && make" run in
> src/gnu/usr/bin/perl
>
Works as expected, with and without "make obj".
> All on both STABLE and CURRENT boxes, in all the currently working
> architectures (i386 and alpha).
>
There are no cross-platform issues to require this to be tested on
Alpha. To convince you it should work, I can only say that miniperl
is built only once in "buildworld" now, at the "cross-tools" stage,
for the "host" platform, and MINIPERL make(1) variable is "miniperl"
during the "all" stage of "buildworld".
The standalong and "buildworld" cases can be easily tested quickly
with "make -V MINIPERL" executed in different subdirs of perl.
<PS>
My previous patch had a flaw in miniperl/Makefile.
</PS>
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
[-- Attachment #2 --]
Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.217
diff -u -p -r1.217 Makefile.inc1
--- Makefile.inc1 2001/09/20 12:24:10 1.217
+++ Makefile.inc1 2001/09/24 14:19:38
@@ -200,7 +200,7 @@ WMAKEENV= ${CROSSENV} \
DESTDIR=${WORLDTMP} \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH}
-WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1
+WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 -DWORLD
# install stage
IMAKEENV= ${CROSSENV} \
@@ -324,7 +324,7 @@ installworld:
mkdir -p ${INSTALLTMP}
for prog in [ awk cat chflags chmod chown date echo egrep find grep \
ln make makewhatis mkdir mtree mv perl rm sed sh sysctl \
- test touch true uname wc which zic; do \
+ test touch true uname wc zic; do \
cp `which $$prog` ${INSTALLTMP}; \
done
cd ${.CURDIR}; ${IMAKE} reinstall
Index: gnu/usr.bin/perl/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- gnu/usr.bin/perl/Makefile 2001/09/21 13:50:30 1.16
+++ gnu/usr.bin/perl/Makefile 2001/09/24 14:19:38
@@ -1,23 +1,11 @@
# $FreeBSD: src/gnu/usr.bin/perl/Makefile,v 1.16 2001/09/21 13:50:30 markm Exp $
-.ifmake !install && !distribute
-_MINI= miniperl
+SUBDIR= libperl
+.if !defined(WORLD)
+SUBDIR+= miniperl
.endif
+SUBDIR+= perl suidperl library pod utils x2p BSDPAN
-SUBDIR= libperl ${_MINI} perl suidperl library pod utils x2p BSDPAN
-
MAINTAINER=markm@freebsd.org
-
-.BEGIN:
-.ifmake depend || all
- if [ \! -f ${.OBJDIR}/build-tools ] ; then \
- cd ${.CURDIR}/libperl && ${MAKE} depend && ${MAKE} all ; \
- cd ${.CURDIR}/miniperl && ${MAKE} depend && ${MAKE} all ; \
- touch ${.OBJDIR}/build-tools ; \
- fi
-.endif
-.ifmake cleandir || clean
- @rm -f ${.OBJDIR}/build-tools
-.endif
.include <bsd.subdir.mk>
Index: gnu/usr.bin/perl/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/Makefile.inc,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile.inc
--- gnu/usr.bin/perl/Makefile.inc 2001/09/21 13:50:31 1.25
+++ gnu/usr.bin/perl/Makefile.inc 2001/09/24 14:19:38
@@ -2,7 +2,15 @@
PERL5SRC?= ${.CURDIR}/../../../../contrib/perl5
PERL5LIBSRC?= ${.CURDIR}/../libperl
-MINIPERL!= echo `PATH=$$PATH:${.OBJDIR}/../miniperl:${.OBJDIR}/../../miniperl which miniperl`
+
+.if !defined(WORLD)
+.if exists(${.OBJDIR}/../miniperl/miniperl)
+MINIPERL?= ${.OBJDIR}/../miniperl/miniperl
+.elif exists(${.OBJDIR}/../../miniperl/miniperl)
+MINIPERL?= ${.OBJDIR}/../../miniperl/miniperl
+.endif
+.endif
+MINIPERL?= miniperl
BINDIR?= /usr/bin
Index: gnu/usr.bin/perl/library/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/Makefile.inc,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.inc
--- gnu/usr.bin/perl/library/Makefile.inc 2001/05/26 17:40:09 1.7
+++ gnu/usr.bin/perl/library/Makefile.inc 2001/09/24 14:19:38
@@ -2,7 +2,6 @@
PERL5SRC?= ${.CURDIR}/../../../../../contrib/perl5
PERL5LIBSRC?= ${.CURDIR}/../../libperl
-MINIPERL= miniperl
MODULEDIR?= ${MODULE}
Index: gnu/usr.bin/perl/miniperl/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/miniperl/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- gnu/usr.bin/perl/miniperl/Makefile 2001/02/13 05:19:56 1.18
+++ gnu/usr.bin/perl/miniperl/Makefile 2001/09/24 14:19:39
@@ -19,6 +19,10 @@ build-tools: cleandepend
NO_PERL_SCRIPT_MAKE= true
+.if !defined(BOOTSTRAPPING)
+install:
+.endif
+
.include <bsd.prog.mk>
.PATH: ${PERL5SRC}
Index: gnu/usr.bin/perl/pod/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/pod/Makefile.inc,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.inc
--- gnu/usr.bin/perl/pod/Makefile.inc 2000/11/20 02:17:33 1.4
+++ gnu/usr.bin/perl/pod/Makefile.inc 2001/09/24 14:19:39
@@ -4,7 +4,6 @@
PERL5SRC?= ${.CURDIR}/../../../../../contrib/perl5
MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
-MINIPERL= miniperl
CLEANFILES+= ${PROG}.1 ${PROG}.PL
Index: gnu/usr.bin/perl/x2p/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/x2p/Makefile.inc,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.inc
--- gnu/usr.bin/perl/x2p/Makefile.inc 2000/11/20 02:17:34 1.7
+++ gnu/usr.bin/perl/x2p/Makefile.inc 2001/09/24 14:19:43
@@ -5,7 +5,6 @@
PERL5SRC= ${.CURDIR}/../../../../../contrib/perl5
PERL5LIBSRC= ${.CURDIR}/../../libperl
MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
-MINIPERL= miniperl
LDFLAGS+= -L${.OBJDIR}/../../libperl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010924172640.B79120>