Respect system ${CFLAGS} when building Perl modules.

bsd.obj.mk -> bsd.prog.mk in modules makefiles, as the latter automatically includes ../Makefile.inc and adds -I${DESTDIR}/usr/include to ${CFLAGS} needed for "make world" which is built with -nostdinc. Reviewed by: MAINTAINER timeout
2001-10-19 12:58:22 +00:00 · 2001-10-19 12:58:22 +00:00 · 45cd307781
commit 45cd307781
parent 1eb768ee31
21 changed files with 23 additions and 43 deletions
--- a/gnu/usr.bin/perl/Makefile.inc
+++ b/gnu/usr.bin/perl/Makefile.inc
@ -60,8 +60,8 @@ links: ${DEPEND_H}
 	@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 @@ MAKEMAKER_ARGS?=	INSTALLDIRS=perl PERL_SRC=${.OBJDIR} \
 		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
--- a/gnu/usr.bin/perl/library/B/Makefile
+++ b/gnu/usr.bin/perl/library/B/Makefile
@ -2,5 +2,4 @@

 MODULE=	B

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/ByteLoader/Makefile
+++ b/gnu/usr.bin/perl/library/ByteLoader/Makefile
@ -2,5 +2,4 @@

 MODULE=	ByteLoader

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/DB_File/Makefile
+++ b/gnu/usr.bin/perl/library/DB_File/Makefile
@ -2,5 +2,4 @@

 MODULE=	DB_File

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/DProf/Makefile
+++ b/gnu/usr.bin/perl/library/DProf/Makefile
@ -3,5 +3,4 @@
 MODULE=		DProf
 MODULEDIR=	Devel/DProf

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/Dumper/Makefile
+++ b/gnu/usr.bin/perl/library/Dumper/Makefile
@ -3,5 +3,4 @@
 MODULE=		Dumper
 MODULEDIR=	Data/Dumper

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/Errno/Makefile
+++ b/gnu/usr.bin/perl/library/Errno/Makefile
@ -2,5 +2,4 @@

 MODULE=	Errno

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/Fcntl/Makefile
+++ b/gnu/usr.bin/perl/library/Fcntl/Makefile
@ -2,5 +2,4 @@

 MODULE=	Fcntl

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/Glob/Makefile
+++ b/gnu/usr.bin/perl/library/Glob/Makefile
@ -3,5 +3,4 @@
 MODULE=		Glob
 MODULEDIR=	File/Glob

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/Hostname/Makefile
+++ b/gnu/usr.bin/perl/library/Hostname/Makefile
@ -3,5 +3,4 @@
 MODULE=		Hostname
 MODULEDIR=	Sys/Hostname

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/IO/Makefile
+++ b/gnu/usr.bin/perl/library/IO/Makefile
@ -2,5 +2,4 @@

 MODULE=	IO

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/NDBM_File/Makefile
+++ b/gnu/usr.bin/perl/library/NDBM_File/Makefile
@ -2,5 +2,4 @@

 MODULE=	NDBM_File

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/Opcode/Makefile
+++ b/gnu/usr.bin/perl/library/Opcode/Makefile
@ -2,5 +2,4 @@

 MODULE=	Opcode

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/POSIX/Makefile
+++ b/gnu/usr.bin/perl/library/POSIX/Makefile
@ -2,5 +2,4 @@

 MODULE=	POSIX

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/Peek/Makefile
+++ b/gnu/usr.bin/perl/library/Peek/Makefile
@ -3,5 +3,4 @@
 MODULE=		Peek
 MODULEDIR=	Devel/Peek

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/SDBM_File/Makefile
+++ b/gnu/usr.bin/perl/library/SDBM_File/Makefile
@ -2,5 +2,4 @@

 MODULE=	SDBM_File

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/Socket/Makefile
+++ b/gnu/usr.bin/perl/library/Socket/Makefile
@ -2,5 +2,4 @@

 MODULE=	Socket

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/SysV/Makefile
+++ b/gnu/usr.bin/perl/library/SysV/Makefile
@ -3,5 +3,4 @@
 MODULE=		SysV
 MODULEDIR=	IPC/SysV

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/Syslog/Makefile
+++ b/gnu/usr.bin/perl/library/Syslog/Makefile
@ -3,5 +3,4 @@
 MODULE=		Syslog
 MODULEDIR=	Sys/Syslog

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/attrs/Makefile
+++ b/gnu/usr.bin/perl/library/attrs/Makefile
@ -2,5 +2,4 @@

 MODULE=	attrs

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
--- a/gnu/usr.bin/perl/library/re/Makefile
+++ b/gnu/usr.bin/perl/library/re/Makefile
@ -2,5 +2,4 @@

 MODULE=	re

-.include "../Makefile.inc"
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>