diff options
author | markm <markm@FreeBSD.org> | 2000-08-20 10:03:26 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2000-08-20 10:03:26 +0000 |
commit | 9f3810952042f8aa69e08a90113163653b3150fd (patch) | |
tree | 5eacfcd4a02ba5f81f3b35239e09c633579233ef /gnu | |
parent | 0c10af18c058283ed8a83546d0822ba01060a466 (diff) | |
download | FreeBSD-src-9f3810952042f8aa69e08a90113163653b3150fd.zip FreeBSD-src-9f3810952042f8aa69e08a90113163653b3150fd.tar.gz |
Fixes and cleanups to the perl build; don't error out when NOCLEAN is
set and directories are being (re)made; build the procname ($0) stuff,
don't install miniperl.
(Miniperl needs a revisit).
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/usr.bin/perl/Makefile.inc | 4 | ||||
-rw-r--r-- | gnu/usr.bin/perl/libperl/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/perl/libperl/config.SH-elf.alpha | 4 | ||||
-rw-r--r-- | gnu/usr.bin/perl/libperl/config.SH-elf.i386 | 4 | ||||
-rw-r--r-- | gnu/usr.bin/perl/libperl/config.SH-threads-elf.alpha | 4 | ||||
-rw-r--r-- | gnu/usr.bin/perl/libperl/config.SH-threads-elf.i386 | 4 | ||||
-rw-r--r-- | gnu/usr.bin/perl/miniperl/Makefile | 6 |
7 files changed, 20 insertions, 10 deletions
diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc index 3bdb4ee..d159238 100644 --- a/gnu/usr.bin/perl/Makefile.inc +++ b/gnu/usr.bin/perl/Makefile.inc @@ -45,8 +45,8 @@ links: ${DEPEND_H} done ;\ done @ln -sf ${PERL5SRC}/ext/File/Glob/Glob.pm lib/File/Glob.pm - @mkdir lib/auto - @mkdir build + @-mkdir lib/auto + @-mkdir build @ln -sf ${PERL5SRC}/config_h.SH config_h.sh @ln -sf ${PERL5SRC}/cflags.SH cflags.sh @ln -sf ${PERL5SRC}/ext/re/re.pm lib/re.pm diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile index 824ce61..ea972bd 100644 --- a/gnu/usr.bin/perl/libperl/Makefile +++ b/gnu/usr.bin/perl/libperl/Makefile @@ -10,8 +10,8 @@ SRCS= perl.c gv.c toke.c perly.c op.c regcomp.c dump.c util.c mg.c \ xsutils.c globals.c perlio.c perlapi.c \ config.h -DPADD= ${LIBM} -LDADD= -lm +DPADD= ${LIBM} ${LIBUTIL} +LDADD= -lm -lutil NO_PERL_SCRIPT_MAKE= true diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha index 4289e72..8ce02be 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha +++ b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha @@ -292,6 +292,7 @@ d_setpgid='define' d_setpgrp2='undef' d_setpgrp='define' d_setprior='define' +d_setproctitle='define' d_setpwent='define' d_setregid='define' d_setresgid='define' @@ -438,6 +439,7 @@ i_grp='define' i_iconv='undef' i_ieeefp='define' i_inttypes='define' +i_libutil='define' i_limits='define' i_locale='define' i_machcthr='undef' @@ -543,7 +545,7 @@ libsdirs=' /usr/lib' libsfiles=' libm.so.2 libc.so.4 libcrypt.so.2' libsfound=' /usr/lib/libm.so.2 /usr/lib/libc.so.4 /usr/lib/libcrypt.so.2' libspath=' /usr/lib' -libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x iconv' +libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x iconv util' line='' lint='' lkflags='' diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 b/gnu/usr.bin/perl/libperl/config.SH-elf.i386 index 46b762e..ac2cb4e 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 +++ b/gnu/usr.bin/perl/libperl/config.SH-elf.i386 @@ -292,6 +292,7 @@ d_setpgid='define' d_setpgrp2='undef' d_setpgrp='define' d_setprior='define' +d_setproctitle='define' d_setpwent='define' d_setregid='define' d_setresgid='define' @@ -438,6 +439,7 @@ i_grp='define' i_iconv='undef' i_ieeefp='define' i_inttypes='define' +i_libutil='define' i_limits='define' i_locale='define' i_machcthr='undef' @@ -543,7 +545,7 @@ libsdirs=' /usr/lib' libsfiles=' libm.so.2 libc.so.4 libcrypt.so.2' libsfound=' /usr/lib/libm.so.2 /usr/lib/libc.so.4 /usr/lib/libcrypt.so.2' libspath=' /usr/lib' -libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x iconv' +libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x iconv util' line='' lint='' lkflags='' diff --git a/gnu/usr.bin/perl/libperl/config.SH-threads-elf.alpha b/gnu/usr.bin/perl/libperl/config.SH-threads-elf.alpha index 48e1883..378005d 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-threads-elf.alpha +++ b/gnu/usr.bin/perl/libperl/config.SH-threads-elf.alpha @@ -292,6 +292,7 @@ d_setpgid='define' d_setpgrp2='undef' d_setpgrp='define' d_setprior='define' +d_setproctitle='define' d_setpwent='define' d_setregid='define' d_setresgid='define' @@ -438,6 +439,7 @@ i_grp='define' i_iconv='undef' i_ieeefp='define' i_inttypes='define' +i_libutil='define' i_limits='define' i_locale='define' i_machcthr='undef' @@ -543,7 +545,7 @@ libsdirs=' /usr/lib' libsfiles=' libm.so.2 libc.so.4 libcrypt.so.2' libsfound=' /usr/lib/libm.so.2 /usr/lib/libc.so.4 /usr/lib/libcrypt.so.2' libspath=' /usr/lib' -libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x iconv' +libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x iconv util' line='' lint='' lkflags='' diff --git a/gnu/usr.bin/perl/libperl/config.SH-threads-elf.i386 b/gnu/usr.bin/perl/libperl/config.SH-threads-elf.i386 index 783949e..d824030 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-threads-elf.i386 +++ b/gnu/usr.bin/perl/libperl/config.SH-threads-elf.i386 @@ -292,6 +292,7 @@ d_setpgid='define' d_setpgrp2='undef' d_setpgrp='define' d_setprior='define' +d_setproctitle='define' d_setpwent='define' d_setregid='define' d_setresgid='define' @@ -438,6 +439,7 @@ i_grp='define' i_iconv='undef' i_ieeefp='define' i_inttypes='define' +i_libutil='define' i_limits='define' i_locale='define' i_machcthr='undef' @@ -543,7 +545,7 @@ libsdirs=' /usr/lib' libsfiles=' libm.so.2 libc.so.4 libcrypt.so.2' libsfound=' /usr/lib/libm.so.2 /usr/lib/libc.so.4 /usr/lib/libcrypt.so.2' libspath=' /usr/lib' -libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x iconv' +libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x iconv util' line='' lint='' lkflags='' diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile index cdc8bc1..62a1a8a 100644 --- a/gnu/usr.bin/perl/miniperl/Makefile +++ b/gnu/usr.bin/perl/miniperl/Makefile @@ -11,12 +11,14 @@ MYLIBPERL= ${.OBJDIR}/../libperl/libperl.a .else MYLIBPERL= ${.CURDIR}/../libperl/libperl.a .endif -DPADD= ${MYLIBPERL} ${LIBM} ${LIBCRYPT} -LDADD= ${MYLIBPERL} -lm -lcrypt +DPADD= ${MYLIBPERL} ${LIBM} ${LIBCRYPT} ${LIBUTIL} +LDADD= ${MYLIBPERL} -lm -lcrypt -lutil build-tools: cleandepend cd ${.CURDIR} && ${MAKE} ${PROG} +install distribute: + NO_PERL_SCRIPT_MAKE= true .include <bsd.prog.mk> |