Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Oct 2001 19:47:32 +0300
From:      Ruslan Ermilov <ru@FreeBSD.org>
To:        Bruce Evans <bde@zeta.org.au>, Mark Murray <markm@FreeBSD.org>
Cc:        "Andrey A. Chernov" <ache@nagual.pp.ru>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   Re: cvs commit: src Makefile.inc1 src/secure/lib/libtelnet Makefile src/share/mk bsd.lib.mk src/gnu/usr.bin/perl Makefile Makefile.inc src/gnu/usr.bin/perl/libperl Makefile src/gnu/usr.bin/perl/librar
Message-ID:  <20011005194732.B64958@sunbay.com>
In-Reply-To: <20011004153154.J48758@sunbay.com>; from ru@FreeBSD.org on Thu, Oct 04, 2001 at 03:31:54PM %2B0300
References:  <20010929183706.A62849@nagual.pp.ru> <20011004214302.M7358-100000@delplex.bde.org> <20011004153154.J48758@sunbay.com>

next in thread | previous in thread | raw e-mail | index | archive | help

--17pEHd4RhPHOinZp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Thu, Oct 04, 2001 at 03:31:54PM +0300, Ruslan Ermilov wrote:
> On Thu, Oct 04, 2001 at 09:52:25PM +1000, Bruce Evans wrote:
> > On Sat, 29 Sep 2001, Andrey A. Chernov wrote:
> > 
> > > On Sat, Sep 29, 2001 at 06:17:55 -0700, Ruslan Ermilov wrote:
> > > >   1.  To cross-build, one now needs to set TARGET_ARCH, and not the
> > > >       MACHINE_ARCH.  MACHINE_ARCH should never be changed manually!
> > > >
> > > Is there any chance to pick CFLAGS from make.conf while building system
> > > perl modules? Currently they build even without -O, i.e. too slow.
> > 
> > This seems to be a configuration issue.  The flags seem to be just the
> > ones in ccflags in libperl/config.SH-elf.${MACHINE_ARCH}.
> > 
> Yes, that's what the ``optimize'' thing is for.  But the problem is that
> config.sh checks CFLAGS from environment, and make(1) doesn't set it
> in environment.  The following patch fixes this:
> 
*Sigh*.  This only worked for non-world builds.  "world" build sets
-nostdinc as a safety measure, but <bsd.obj.mk> has no magic to add
the required -I${DESTDIR}/usr/include support to CFLAGS.

Bruce, that's yet one reason to move this to Makefile.inc1.  :-)

The attached patch should make it through the "make world" as well.

<PS>
Perl modules build procedure is horribly broken.  It doesn't create
.depend file which is the prerequisite for a proper -DNOCLEAN world
operation.
</PS>

Andrey, Mark, I would really appreciate the feedback on this.  :-)


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

--17pEHd4RhPHOinZp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=p

Index: Makefile.inc
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/Makefile.inc,v
retrieving revision 1.26
diff -u -r1.26 Makefile.inc
--- Makefile.inc	2001/09/29 13:17:53	1.26
+++ Makefile.inc	2001/10/05 16:32:10
@@ -60,8 +60,8 @@
 	@ln -sf ${PERL5SRC}/writemain.SH writemain.sh
 	@ln -sf ${PERL5SRC}/regcomp.c regcomp.c
 	@ln -sf ${PERL5SRC}/regexec.c regexec.c
-	@ln -sf ${PERL5LIBSRC}/config.SH-${OBJFORMAT}.${MACHINE_ARCH} \
-		config.sh
+	@sed "s;^optimize=.*$$;optimize=\'${CFLAGS}\';" \
+		${PERL5LIBSRC}/config.SH-${OBJFORMAT}.${MACHINE_ARCH} > config.sh
 	@touch ${.TARGET}
 
 scripts: links
@@ -92,7 +92,7 @@
 		PERL=${MINIPERL} FULLPERL=perl DEFINE=-I${DESTDIR}/usr/include \
 		DEFINE=-DPERL_CORE
 
-CFLAGS+=	'-DAPPLLIB_EXP="/usr/libdata/perl/BSDPAN"'
+CFLAGS+=	-DAPPLLIB_EXP=\"/usr/libdata/perl/BSDPAN\"
 
 .if defined(PERL_DEBUGGING) && ${PERL_DEBUGGING} == "true"
 CFLAGS+=        -DDEBUGGING
Index: library/B/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/B/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/B/Makefile	2000/06/25 14:48:03	1.1
+++ library/B/Makefile	2001/10/05 16:32:10
@@ -2,5 +2,4 @@
 
 MODULE=	B
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/ByteLoader/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/ByteLoader/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/ByteLoader/Makefile	2000/06/25 14:48:03	1.1
+++ library/ByteLoader/Makefile	2001/10/05 16:32:10
@@ -2,5 +2,4 @@
 
 MODULE=	ByteLoader
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/DB_File/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/DB_File/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/DB_File/Makefile	2000/06/25 14:48:04	1.1
+++ library/DB_File/Makefile	2001/10/05 16:32:10
@@ -2,5 +2,4 @@
 
 MODULE=	DB_File
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/DProf/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/DProf/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/DProf/Makefile	2000/06/25 14:48:04	1.1
+++ library/DProf/Makefile	2001/10/05 16:32:10
@@ -3,5 +3,4 @@
 MODULE=		DProf
 MODULEDIR=	Devel/DProf
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/Dumper/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/Dumper/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/Dumper/Makefile	2000/06/25 14:48:04	1.1
+++ library/Dumper/Makefile	2001/10/05 16:32:11
@@ -3,5 +3,4 @@
 MODULE=		Dumper
 MODULEDIR=	Data/Dumper
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/Errno/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/Errno/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/Errno/Makefile	2000/06/25 14:48:04	1.1
+++ library/Errno/Makefile	2001/10/05 16:32:11
@@ -2,5 +2,4 @@
 
 MODULE=	Errno
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/Fcntl/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/Fcntl/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/Fcntl/Makefile	2000/06/25 14:48:05	1.1
+++ library/Fcntl/Makefile	2001/10/05 16:32:11
@@ -2,5 +2,4 @@
 
 MODULE=	Fcntl
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/Glob/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/Glob/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/Glob/Makefile	2000/06/25 14:48:05	1.1
+++ library/Glob/Makefile	2001/10/05 16:32:11
@@ -3,5 +3,4 @@
 MODULE=		Glob
 MODULEDIR=	File/Glob
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/Hostname/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/Hostname/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/Hostname/Makefile	2000/06/25 14:48:06	1.1
+++ library/Hostname/Makefile	2001/10/05 16:32:11
@@ -3,5 +3,4 @@
 MODULE=		Hostname
 MODULEDIR=	Sys/Hostname
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/IO/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/IO/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/IO/Makefile	2000/06/25 14:48:06	1.1
+++ library/IO/Makefile	2001/10/05 16:32:11
@@ -2,5 +2,4 @@
 
 MODULE=	IO
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/NDBM_File/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/NDBM_File/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/NDBM_File/Makefile	2000/06/25 14:48:06	1.1
+++ library/NDBM_File/Makefile	2001/10/05 16:32:11
@@ -2,5 +2,4 @@
 
 MODULE=	NDBM_File
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/Opcode/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/Opcode/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/Opcode/Makefile	2000/06/25 14:48:10	1.1
+++ library/Opcode/Makefile	2001/10/05 16:32:13
@@ -2,5 +2,4 @@
 
 MODULE=	Opcode
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/POSIX/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/POSIX/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/POSIX/Makefile	2000/06/25 14:48:11	1.1
+++ library/POSIX/Makefile	2001/10/05 16:32:13
@@ -2,5 +2,4 @@
 
 MODULE=	POSIX
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/Peek/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/Peek/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/Peek/Makefile	2000/06/25 14:48:11	1.1
+++ library/Peek/Makefile	2001/10/05 16:32:13
@@ -3,5 +3,4 @@
 MODULE=		Peek
 MODULEDIR=	Devel/Peek
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/SDBM_File/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/SDBM_File/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/SDBM_File/Makefile	2000/06/25 14:48:11	1.1
+++ library/SDBM_File/Makefile	2001/10/05 16:32:13
@@ -2,5 +2,4 @@
 
 MODULE=	SDBM_File
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/Socket/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/Socket/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/Socket/Makefile	2000/06/25 14:48:11	1.1
+++ library/Socket/Makefile	2001/10/05 16:32:13
@@ -2,5 +2,4 @@
 
 MODULE=	Socket
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/SysV/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/SysV/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/SysV/Makefile	2000/06/25 14:48:13	1.1
+++ library/SysV/Makefile	2001/10/05 16:32:13
@@ -3,5 +3,4 @@
 MODULE=		SysV
 MODULEDIR=	IPC/SysV
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/Syslog/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/Syslog/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/Syslog/Makefile	2000/06/25 14:48:14	1.1
+++ library/Syslog/Makefile	2001/10/05 16:32:13
@@ -3,5 +3,4 @@
 MODULE=		Syslog
 MODULEDIR=	Sys/Syslog
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/attrs/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/attrs/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/attrs/Makefile	2000/06/25 14:48:14	1.1
+++ library/attrs/Makefile	2001/10/05 16:32:14
@@ -2,5 +2,4 @@
 
 MODULE=	attrs
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
Index: library/re/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/re/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- library/re/Makefile	2000/06/25 14:48:14	1.1
+++ library/re/Makefile	2001/10/05 16:32:14
@@ -2,5 +2,4 @@
 
 MODULE=	re
 
-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>

--17pEHd4RhPHOinZp--

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?20011005194732.B64958>