From 2af42a0a9d0136877217d42d7c42662c4fa7b952 Mon Sep 17 00:00:00 2001 From: markm Date: Tue, 22 Sep 1998 12:00:59 +0000 Subject: Big cleanup of the perl build. 1) Inspired by JB's finding of a hardcoded /usr/bin/ranlib in the config files, these have been properly cleaned up and have been personalised for FreeBSD, not MarkM. 2) Inspired by Peter, copying of the lib/ext etc dirs has been replaced by a link farm. 3) Common code has been moved to a higher-level Makefile.inc. This has been tested with a make -j8. --- gnu/usr.bin/perl/Makefile.inc | 29 ++++++++- gnu/usr.bin/perl/libperl/config.SH-aout.i386 | 32 +++++----- gnu/usr.bin/perl/libperl/config.SH-elf.alpha | 32 +++++----- gnu/usr.bin/perl/libperl/config.SH-elf.i386 | 32 +++++----- gnu/usr.bin/perl/perl/Makefile | 96 +++++++++++++--------------- gnu/usr.bin/perl/suidperl/Makefile | 73 ++++++++------------- gnu/usr.bin/perl/utils/perlbug/Makefile | 8 +-- gnu/usr.bin/perl/x2p/a2pl/Makefile | 6 +- 8 files changed, 157 insertions(+), 151 deletions(-) (limited to 'gnu') diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc index 3c89259..eb885a2 100644 --- a/gnu/usr.bin/perl/Makefile.inc +++ b/gnu/usr.bin/perl/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.3 1998/09/09 07:20:10 markm Exp $ +# $Id: Makefile.inc,v 1.4 1998/09/12 19:16:32 markm Exp $ PERL5SRC?= ${.CURDIR}/../../../../contrib/perl5 @@ -6,3 +6,30 @@ BINDIR?= /usr/bin SHLIB_MAJOR?= 3 SHLIB_MINOR?= 0 + +HEADERS=EXTERN.h INTERN.h XSUB.h XSlock.h av.h bytecode.h byterun.h \ + cc_runtime.h cop.h cv.h dosish.h embed.h embedvar.h fakethr.h form.h \ + gv.h handy.h hv.h intrpvar.h iperlsys.h keywords.h mg.h nostdio.h \ + objXSUB.h objpp.h op.h opcode.h patchlevel.h perl.h perlio.h \ + perlsdio.h perlsfio.h perlvars.h perly.h pp.h pp_proto.h proto.h \ + regcomp.h regexp.h regnodes.h scope.h sv.h thrdvar.h thread.h \ + unixish.h util.h + +DEPEND_H= + +.for I in ${HEADERS} +${.OBJDIR}/${I}: ${I} + @ln -sf ${.OODATE} ${.TARGET} + +CLEANFILES+= ${.OBJDIR}/${I} +DEPEND_H+= ${.OBJDIR}/${I} +.endfor + +lib ext Porting hints: + @rm -rf ${.TARGET} + for i in `cd ${PERL5SRC}; find ${.TARGET} -type d` ; do \ + mkdir -p $${i} ;\ + done + for i in `cd ${PERL5SRC}; find ${.TARGET} -type f` ; do \ + ln -s ${PERL5SRC}/$${i} $${i} ;\ + done diff --git a/gnu/usr.bin/perl/libperl/config.SH-aout.i386 b/gnu/usr.bin/perl/libperl/config.SH-aout.i386 index 6ff05c87..8dd9dad 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-aout.i386 +++ b/gnu/usr.bin/perl/libperl/config.SH-aout.i386 @@ -5,12 +5,14 @@ # do not forget to propagate your changes by running "Configure -der". You may # instead choose to run each of the .SH files by yourself, or "Configure -S". # +# $Id$ +# # Package name : perl5 # Source directory : . -# Configuration time: Wed Sep 2 12:54:30 SAST 1998 -# Configured by : root -# Target system : freebsd greenpeace.grondar.za 3.0-current freebsd 3.0-current #0: sat aug 22 14:55:55 sast 1998 root@greenpeace.grondar.za:usrsrcsyscompilega586dx i386 +# Configuration time: $Date$ +# Configured by : markm +# Target system : freebsd 3.0-current #0: Author='' Date='$Date' @@ -51,9 +53,9 @@ cc='cc' cccdlflags='-DPIC -fpic' ccdlflags=' ' ccflags='' -cf_by='root' -cf_email='root@greenpeace.grondar.za' -cf_time='Wed Sep 2 12:54:30 SAST 1998' +cf_by='markm' +cf_email='markm@freebsd.org' +cf_time='$Date$' chgrp='' chmod='' chown='' @@ -317,7 +319,7 @@ flex='' fpostype='fpos_t' freetype='void' full_csh='/bin/csh' -full_sed='/usr/bin/sed' +full_sed='sed' gccversion='2.7.2.1' gidtype='gid_t' glibpth='/usr/lib /usr/lib/elf /usr/lib/aout' @@ -412,7 +414,7 @@ line='line' lint='' lkflags='' ln='ln' -lns='/bin/ln -s' +lns='ln -s' locincpth='' loclibpth='' longdblsize='12' @@ -444,9 +446,9 @@ modetype='mode_t' more='more' mv='' myarchname='i386-freebsd' -mydomain='.grondar.za' -myhostname='greenpeace' -myuname='freebsd greenpeace.grondar.za 3.0-current freebsd 3.0-current #0: sat aug 22 14:55:55 sast 1998 root@greenpeace.grondar.za:usrsrcsyscompilega586dx i386 ' +mydomain='.freebsd.org' +myhostname='freefall' +myuname='freebsd 3.0-current #0: ' n='-n' netdb_hlen_type='int' netdb_host_type='const char *' @@ -464,12 +466,12 @@ orderlib='false' osname='freebsd' osvers='3.0-current' package='perl5' -pager='/usr/bin/more' +pager='more' passcat='cat /etc/passwd' patchlevel='5' path_sep=':' perl='perl' -perladmin='root@greenpeace.grondar.za' +perladmin='current@freebsd.org' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' @@ -569,7 +571,7 @@ zcat='' zip='zip' # Configure command line arguments. config_arg0='Configure' -config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl/5.00502/i386-freebsd -Dsitelib=/usr/local/lib/perl/5.00502 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more' +config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl/5.00502/i386-freebsd -Dsitelib=/usr/local/lib/perl/5.00502 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' config_argc=11 config_arg1='-Dprefix=/usr' config_arg2='-Darchlib=/usr/libdata/perl/5.00502/mach' @@ -581,7 +583,7 @@ config_arg7='-Dman3dir=/usr/share/perl/man/man3' config_arg8='-des' config_arg9='-Ulocincpth=' config_arg10='-Uloclibpth=' -config_arg11='-Dpager=/usr/bin/more' +config_arg11='-Dpager=more' PATCHLEVEL=5 SUBVERSION=2 CONFIG=true diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha index ab15032..08eb05f 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha +++ b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha @@ -5,12 +5,14 @@ # do not forget to propagate your changes by running "Configure -der". You may # instead choose to run each of the .SH files by yourself, or "Configure -S". # +# $Id$ +# # Package name : perl5 # Source directory : . -# Configuration time: Wed Sep 2 12:54:30 SAST 1998 -# Configured by : root -# Target system : freebsd greenpeace.grondar.za 3.0-current freebsd 3.0-current #0: sat aug 22 14:55:55 sast 1998 root@greenpeace.grondar.za:usrsrcsyscompilega586dx alpha +# Configuration time: $Date$ +# Configured by : markm +# Target system : freebsd 3.0-current #0: Author='' Date='$Date' @@ -51,9 +53,9 @@ cc='cc' cccdlflags='-DPIC -fpic' ccdlflags=' ' ccflags='' -cf_by='root' -cf_email='root@greenpeace.grondar.za' -cf_time='Wed Sep 2 12:54:30 SAST 1998' +cf_by='markm' +cf_email='markm@freebsd.org' +cf_time='$Date$' chgrp='' chmod='' chown='' @@ -317,7 +319,7 @@ flex='' fpostype='fpos_t' freetype='void' full_csh='/bin/csh' -full_sed='/usr/bin/sed' +full_sed='sed' gccversion='2.7.2.1' gidtype='gid_t' glibpth="/usr/lib /usr/local/lib" @@ -412,7 +414,7 @@ line='line' lint='' lkflags='' ln='ln' -lns='/bin/ln -s' +lns='ln -s' locincpth='' loclibpth='' longdblsize='8' @@ -444,9 +446,9 @@ modetype='mode_t' more='more' mv='' myarchname='alpha-freebsd' -mydomain='.grondar.za' -myhostname='greenpeace' -myuname='freebsd greenpeace.grondar.za 3.0-current freebsd 3.0-current #0: sat aug 22 14:55:55 sast 1998 root@greenpeace.grondar.za:usrsrcsyscompilega586dx alpha ' +mydomain='.freebsd.org' +myhostname='freefall' +myuname='freebsd 3.0-current #0: ' n='-n' netdb_hlen_type='int' netdb_host_type='const char *' @@ -464,12 +466,12 @@ orderlib='false' osname='freebsd' osvers='3.0-current' package='perl5' -pager='/usr/bin/more' +pager='more' passcat='cat /etc/passwd' patchlevel='5' path_sep=':' perl='perl' -perladmin='root@greenpeace.grondar.za' +perladmin='current@freebsd.org' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' @@ -569,7 +571,7 @@ zcat='' zip='zip' # Configure command line arguments. config_arg0='Configure' -config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl/5.00502/alpha-freebsd -Dsitelib=/usr/local/lib/perl/5.00502 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more' +config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl/5.00502/alpha-freebsd -Dsitelib=/usr/local/lib/perl/5.00502 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' config_argc=11 config_arg1='-Dprefix=/usr' config_arg2='-Darchlib=/usr/libdata/perl/5.00502/mach' @@ -581,7 +583,7 @@ config_arg7='-Dman3dir=/usr/share/perl/man/man3' config_arg8='-des' config_arg9='-Ulocincpth=' config_arg10='-Uloclibpth=' -config_arg11='-Dpager=/usr/bin/more' +config_arg11='-Dpager=more' PATCHLEVEL=5 SUBVERSION=2 CONFIG=true diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 b/gnu/usr.bin/perl/libperl/config.SH-elf.i386 index 866d1a3..84b739e 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 +++ b/gnu/usr.bin/perl/libperl/config.SH-elf.i386 @@ -5,12 +5,14 @@ # do not forget to propagate your changes by running "Configure -der". You may # instead choose to run each of the .SH files by yourself, or "Configure -S". # +# $Id$ +# # Package name : perl5 # Source directory : . -# Configuration time: Wed Sep 2 12:54:30 SAST 1998 -# Configured by : root -# Target system : freebsd greenpeace.grondar.za 3.0-current freebsd 3.0-current #0: sat aug 22 14:55:55 sast 1998 root@greenpeace.grondar.za:usrsrcsyscompilega586dx i386 +# Configuration time: $Date$ +# Configured by : markm +# Target system : freebsd 3.0-current #0: Author='' Date='$Date' @@ -51,9 +53,9 @@ cc='cc' cccdlflags='-DPIC -fpic' ccdlflags=' ' ccflags='' -cf_by='root' -cf_email='root@greenpeace.grondar.za' -cf_time='Wed Sep 2 12:54:30 SAST 1998' +cf_by='markm' +cf_email='markm@freebsd.org' +cf_time='$Date$' chgrp='' chmod='' chown='' @@ -317,7 +319,7 @@ flex='' fpostype='fpos_t' freetype='void' full_csh='/bin/csh' -full_sed='/usr/bin/sed' +full_sed='sed' gccversion='2.7.2.1' gidtype='gid_t' glibpth="/usr/lib /usr/local/lib" @@ -412,7 +414,7 @@ line='line' lint='' lkflags='' ln='ln' -lns='/bin/ln -s' +lns='ln -s' locincpth='' loclibpth='' longdblsize='12' @@ -444,9 +446,9 @@ modetype='mode_t' more='more' mv='' myarchname='i386-freebsd' -mydomain='.grondar.za' -myhostname='greenpeace' -myuname='freebsd greenpeace.grondar.za 3.0-current freebsd 3.0-current #0: sat aug 22 14:55:55 sast 1998 root@greenpeace.grondar.za:usrsrcsyscompilega586dx i386 ' +mydomain='.freebsd.org' +myhostname='freefall' +myuname='freebsd 3.0-current #0: ' n='-n' netdb_hlen_type='int' netdb_host_type='const char *' @@ -464,12 +466,12 @@ orderlib='false' osname='freebsd' osvers='3.0-current' package='perl5' -pager='/usr/bin/more' +pager='more' passcat='cat /etc/passwd' patchlevel='5' path_sep=':' perl='perl' -perladmin='root@greenpeace.grondar.za' +perladmin='current@freebsd.org' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' @@ -569,7 +571,7 @@ zcat='' zip='zip' # Configure command line arguments. config_arg0='Configure' -config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl/5.00502/i386-freebsd -Dsitelib=/usr/local/lib/perl/5.00502 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more' +config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl/5.00502/i386-freebsd -Dsitelib=/usr/local/lib/perl/5.00502 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' config_argc=11 config_arg1='-Dprefix=/usr' config_arg2='-Darchlib=/usr/libdata/perl/5.00502/mach' @@ -581,7 +583,7 @@ config_arg7='-Dman3dir=/usr/share/perl/man/man3' config_arg8='-des' config_arg9='-Ulocincpth=' config_arg10='-Uloclibpth=' -config_arg11='-Dpager=/usr/bin/more' +config_arg11='-Dpager=more' PATCHLEVEL=5 SUBVERSION=2 CONFIG=true diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile index 88f54bf..18a4338 100644 --- a/gnu/usr.bin/perl/perl/Makefile +++ b/gnu/usr.bin/perl/perl/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.11 1998/09/14 18:34:19 markm Exp $ +# $Id: Makefile,v 1.12 1998/09/16 17:25:52 markm Exp $ # PROG= perl @@ -19,53 +19,35 @@ CLEANDIRS= lib ext Porting hints .include -HEADERS=EXTERN.h INTERN.h XSUB.h XSlock.h av.h bytecode.h byterun.h \ - cc_runtime.h cop.h cv.h dosish.h embed.h embedvar.h fakethr.h form.h \ - gv.h handy.h hv.h intrpvar.h iperlsys.h keywords.h mg.h nostdio.h \ - objXSUB.h objpp.h op.h opcode.h patchlevel.h perl.h perlio.h \ - perlsdio.h perlsfio.h perlvars.h perly.h pp.h pp_proto.h proto.h \ - regcomp.h regexp.h regnodes.h scope.h sv.h thrdvar.h thread.h \ - unixish.h util.h +STATIC_EXT= DynaLoader/DynaLoader DYNAMIC_EXT= B/B DB_File/DB_File Data/Dumper/Dumper Fcntl/Fcntl IO/IO \ IPC/SysV/SysV NDBM_File/NDBM_File Opcode/Opcode POSIX/POSIX \ SDBM_File/SDBM_File Socket/Socket attrs/attrs re/re -${PROG}: lib/auto/DynaLoader/DynaLoader.a +#NONXS_EXT= Errno/pm_to_blib -.ORDER: lib/auto/DynaLoader/DynaLoader.a ${DYNAMIC_EXT} +${PROG}: Config.pm lib/auto/DynaLoader/DynaLoader.a + +lib/auto/DynaLoader/DynaLoader.a: Config.pm autosplit + +.ORDER: ${STATIC_EXT} ${DYNAMIC_EXT} ${NONXS_EXT} config.h: config_h.sh config.sh sh config_h.sh config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}.${MACHINE_ARCH} - cp ${.OODATE} ${.TARGET} + ln -sf ${.OODATE} ${.TARGET} config_h.sh: config_h.SH - cp ${.OODATE} ${.TARGET} + ln -sf ${.OODATE} ${.TARGET} cflags.sh: cflags.SH - cp ${.OODATE} ${.TARGET} + ln -sf ${.OODATE} ${.TARGET} cflags: cflags.sh sh ${.OODATE} -lib: - @rm -rf lib - cp -rp ${PERL5SRC}/lib . - -ext: - @rm -rf ext - cp -rp ${PERL5SRC}/ext . - -Porting: - @rm -rf Porting - cp -rp ${PERL5SRC}/Porting . - -hints: - @rm -rf hints - cp -rp ${PERL5SRC}/hints . - lib/re.pm: lib ext hints ext/re/re.pm cat ${PERL5SRC}/ext/re/re.pm > ${.OBJDIR}/lib/re.pm @@ -79,26 +61,6 @@ Config.pm: myconfig config.sh lib ext hints Porting lib/re.pm miniperl ${PERL5SRC}/configpm \ Config.pm Porting/Glossary myconfig config.sh -DEPEND_H= - -.for I in ${HEADERS} -${.OBJDIR}/${I}: ${I} - @ln -sf ${.OODATE} ${.TARGET} - -CLEANFILES+= ${.OBJDIR}/${I} -DEPEND_H+= ${.OBJDIR}/${I} -.endfor - -lib/auto/DynaLoader/DynaLoader.a: cflags lib/Config.pm ${DEPEND_H} - miniperl -I${.OBJDIR}/lib \ - -e 'use AutoSplit; autosplit_lib_modules(@ARGV)' \ - lib/*.pm lib/*/*.pm - cd ext/DynaLoader; \ - miniperl -I${.OBJDIR}/lib Makefile.PL \ - INSTALLDIRS=perl PERL_SRC=${.OBJDIR}; \ - make -B config PERL_SRC=${.OBJDIR}; \ - make -B all LINKTYPE=static PERL_SRC=${.OBJDIR} - ${.OBJDIR}/miniperlmain.c: miniperlmain.c @ln -sf ${.OODATE} ${.TARGET} @@ -117,18 +79,50 @@ ${.OBJDIR}/regcomp.c: ${PERL5SRC}/regcomp.c ${.OBJDIR}/regexec.c: ${PERL5SRC}/regexec.c @ln -sf ${.OODATE} ${.TARGET} +autosplit: lib ext Porting hints + miniperl -I${.OBJDIR}/lib \ + -e 'use AutoSplit; autosplit_lib_modules(@ARGV)' \ + lib/*.pm lib/*/*.pm + +.for I in ${STATIC_EXT} +lib/auto/${I}.a: ext/${I:H}/Makefile.PL cflags lib/Config.pm ${DEPEND_H} + cd ext/${I:H}; \ + miniperl -I${.OBJDIR}/lib Makefile.PL \ + INSTALLDIRS=perl PERL_SRC=${.OBJDIR}; \ + make -B config PERL_SRC=${.OBJDIR}; \ + make -B all LINKTYPE=static PERL_SRC=${.OBJDIR} + +all: lib/auto/${I}.a + +STATICS+= lib/auto/${I}.a +.endfor + .for I in ${DYNAMIC_EXT} -lib/auto/${I}.so: ${PROG} ${.OBJDIR}/regcomp.c ${.OBJDIR}/regexec.c +lib/auto/${I}.so: ${PROG} ext/${I:H}/Makefile.PL cflags lib/Config.pm \ + ${DEPEND_H} ${.OBJDIR}/regcomp.c ${.OBJDIR}/regexec.c cd ext/${I:H}; \ miniperl -I${.OBJDIR}/lib Makefile.PL \ INSTALLDIRS=perl PERL_SRC=${.OBJDIR} LIBS="-lperl"; \ make -B config PERL_SRC=${.OBJDIR}; \ make -B all LINKTYPE=dynamic PERL_SRC=${.OBJDIR} +all: lib/auto/${I}.so + DYNAMICS+= lib/auto/${I}.so .endfor -all: ${DYNAMICS} +#.for I in ${NONXS_EXT} +#lib/auto/${I}: ${PROG} ext/${I:H}/Makefile.PL cflags lib/Config.pm +# cd ext/${I:H}; \ +# miniperl -I${.OBJDIR}/lib Makefile.PL \ +# INSTALLDIRS=perl PERL_SRC=${.OBJDIR}; \ +# make -B config PERL_SRC=${.OBJDIR}; \ +# make -B all LINKTYPE=nonxs PERL_SRC=${.OBJDIR} +# +#NONXSS+= lib/auto/${I} +#.endfor + +#all: ${DYNAMICS} ${NONXSS} install: miniperl ${.CURDIR}/install_perl_libs -d ${DESTDIR} diff --git a/gnu/usr.bin/perl/suidperl/Makefile b/gnu/usr.bin/perl/suidperl/Makefile index e5d5959..6c4fc6e 100644 --- a/gnu/usr.bin/perl/suidperl/Makefile +++ b/gnu/usr.bin/perl/suidperl/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.2 1998/09/12 15:45:30 markm Exp $ +# $Id: Makefile,v 1.3 1998/09/16 17:25:52 markm Exp $ # PROG= suidperl @@ -18,77 +18,40 @@ CLEANDIRS= lib ext Porting hints .include -HEADERS=EXTERN.h INTERN.h XSUB.h XSlock.h av.h bytecode.h byterun.h \ - cc_runtime.h cop.h cv.h dosish.h embed.h embedvar.h fakethr.h form.h \ - gv.h handy.h hv.h intrpvar.h iperlsys.h keywords.h mg.h nostdio.h \ - objXSUB.h objpp.h op.h opcode.h patchlevel.h perl.h perlio.h \ - perlsdio.h perlsfio.h perlvars.h perly.h pp.h pp_proto.h proto.h \ - regcomp.h regexp.h regnodes.h scope.h sv.h thrdvar.h thread.h \ - unixish.h util.h +STATIC_EXT= DynaLoader/DynaLoader -${PROG}: lib/auto/DynaLoader/DynaLoader.a +${PROG}: Config.pm lib/auto/DynaLoader/DynaLoader.a + +lib/auto/DynaLoader/DynaLoader.a: Config.pm autosplit config.h: config_h.sh config.sh sh config_h.sh config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}.${MACHINE_ARCH} - cp -p ${.OODATE} ${.TARGET} + ln -sf ${.OODATE} ${.TARGET} config_h.sh: config_h.SH - cp -p ${.OODATE} ${.TARGET} + ln -sf ${.OODATE} ${.TARGET} cflags.sh: cflags.SH - cp -p ${.OODATE} ${.TARGET} + ln -sf ${.OODATE} ${.TARGET} cflags: cflags.sh sh ${.OODATE} -lib: - @rm -rf lib - cp -rp ${PERL5SRC}/lib . - -ext: - @rm -rf ext - cp -rp ${PERL5SRC}/ext . - -Porting: - @rm -rf Porting - cp -rp ${PERL5SRC}/Porting . - -hints: - @rm -rf hints - cp -rp ${PERL5SRC}/hints . - lib/re.pm: lib ext hints ext/re/re.pm cat ${PERL5SRC}/ext/re/re.pm > ${.OBJDIR}/lib/re.pm lib/Config.pm: Config.pm - @cp -p ${.OODATE} ${.TARGET} + cp -p ${.OODATE} ${.TARGET} myconfig: ${PERL5SRC}/myconfig - @ln -sf ${.OODATE} ${.TARGET} + ln -sf ${.OODATE} ${.TARGET} Config.pm: myconfig config.sh lib ext hints Porting lib/re.pm miniperl ${PERL5SRC}/configpm \ Config.pm Porting/Glossary myconfig config.sh -DEPEND_H= - -.for I in ${HEADERS} -${.OBJDIR}/${I}: ${I} - @ln -sf ${.OODATE} ${.TARGET} - -CLEANFILES+= ${.OBJDIR}/${I} -DEPEND_H+= ${.OBJDIR}/${I} -.endfor - -lib/auto/DynaLoader/DynaLoader.a: cflags lib/Config.pm ${DEPEND_H} - cd ext/DynaLoader; \ - miniperl -I../../lib Makefile.PL \ - INSTALLDIRS=perl PERL_SRC=${.OBJDIR}; \ - make -B config PERL_SRC=${.OBJDIR}; \ - make -B all LINKTYPE=static PERL_SRC=${.OBJDIR} - ${.OBJDIR}/miniperlmain.c: miniperlmain.c @ln -sf ${.OODATE} ${.TARGET} @@ -104,4 +67,20 @@ writemain.sh: writemain.SH writemain: writemain.sh sh ${.OODATE} +autosplit: lib ext Porting hints + miniperl -I${.OBJDIR}/lib \ + -e 'use AutoSplit; autosplit_lib_modules(@ARGV)' \ + lib/*.pm lib/*/*.pm + +.for I in ${STATIC_EXT} +lib/auto/${I}.a: cflags lib/Config.pm ${DEPEND_H} + cd ext/${I:H}; \ + miniperl -I${.OBJDIR}/lib Makefile.PL \ + INSTALLDIRS=perl PERL_SRC=${.OBJDIR}; \ + make -B config PERL_SRC=${.OBJDIR}; \ + make -B all LINKTYPE=static PERL_SRC=${.OBJDIR} + +STATICS+= lib/auto/${I}.a +.endfor + .PATH: ${PERL5SRC} diff --git a/gnu/usr.bin/perl/utils/perlbug/Makefile b/gnu/usr.bin/perl/utils/perlbug/Makefile index f2e4e98..d8cc174 100644 --- a/gnu/usr.bin/perl/utils/perlbug/Makefile +++ b/gnu/usr.bin/perl/utils/perlbug/Makefile @@ -1,14 +1,14 @@ # -# $Id$ +# $Id: Makefile,v 1.1 1998/09/09 07:20:30 markm Exp $ # PROG= perlbug .include -${PROG}: ${.OBJDIR}/patchlevel.h +${PROG}: patchlevel.h -CLEANFILES+= ${.OBJDIR}/patchlevel.h +CLEANFILES+= patchlevel.h -${.OBJDIR}/patchlevel.h: ${PERL5SRC}/patchlevel.h +patchlevel.h: ${PERL5SRC}/patchlevel.h @ln -sf ${.OODATE} ${.TARGET} diff --git a/gnu/usr.bin/perl/x2p/a2pl/Makefile b/gnu/usr.bin/perl/x2p/a2pl/Makefile index 3309ca3..1ae1b74 100644 --- a/gnu/usr.bin/perl/x2p/a2pl/Makefile +++ b/gnu/usr.bin/perl/x2p/a2pl/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.4 1998/09/12 19:16:33 markm Exp $ +# $Id: Makefile,v 1.5 1998/09/16 17:25:52 markm Exp $ # PROG= a2p @@ -26,10 +26,10 @@ config.h: config_h.sh config.sh sh config_h.sh config.sh: ${.CURDIR}/../../libperl/config.SH-${OBJFORMAT}.${MACHINE_ARCH} - @ln -sf ${.OODATE} ${.TARGET} + ln -sf ${.OODATE} ${.TARGET} config_h.sh: ${PERL5SRC}/config_h.SH - @ln -sf ${.OODATE} ${.TARGET} + ln -sf ${.OODATE} ${.TARGET} ${PROG}.1: ${PROG}.pod miniperl ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET} -- cgit v1.1