From 5ef03882e3fb6f4d6c2ed3bfa8e292161dd27d06 Mon Sep 17 00:00:00 2001 From: markm Date: Wed, 8 Mar 2000 15:45:14 +0000 Subject: [PATCH] Considerable upgrade to the way perl links to shared objects. This fixes the way that third-party apps like apache link in perl .so's (and previously did not get libperl linked in.) NOTE - you neeed to recompile all your perl stuff - all the p5-* por4ts with C code, and things like mod_perl. --- gnu/usr.bin/perl/libperl/Makefile | 2 + gnu/usr.bin/perl/libperl/config.SH-elf.alpha | 42 +++++++++--------- gnu/usr.bin/perl/libperl/config.SH-elf.i386 | 42 +++++++++--------- .../perl/libperl/config.SH-threads-elf.alpha | 44 +++++++++---------- .../perl/libperl/config.SH-threads-elf.i386 | 40 +++++++++-------- gnu/usr.bin/perl/perl/Makefile | 8 ++-- gnu/usr.bin/perl/suidperl/Makefile | 22 ++++++---- 7 files changed, 104 insertions(+), 96 deletions(-) diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile index 22154e5fb58e..b36917cd4406 100644 --- a/gnu/usr.bin/perl/libperl/Makefile +++ b/gnu/usr.bin/perl/libperl/Makefile @@ -11,6 +11,8 @@ SRCS= perl.c gv.c toke.c perly.c op.c regcomp.c dump.c util.c mg.c byterun.c \ doop.c doio.c regexec.c taint.c deb.c universal.c globals.c perlio.c \ config.h +LDADD+= -lm + # NOPIC= true .include diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha index c8f9d0aff98b..7dccb03581d5 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha +++ b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha @@ -45,12 +45,12 @@ castflags='0' cat='cat' cc='cc' cccdlflags='-DPIC -fpic' -ccdlflags=' ' +ccdlflags=' -Wl,-R/usr/lib' ccflags='' -ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400002 __GNUC_MINOR__=91 __GNUC__=2 cpu=alpha machine=alpha system=FreeBSD system=unix' +ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400004 __GNUC_MINOR__=95 __GNUC__=2 cpu=alpha machine=alpha system=FreeBSD system=unix' cf_by='markm' -cf_email='markm@freebsd.org' -cf_time='$Date$' +cf_email='markm@FreeBSD.org' +cf_time='Sun Mar 5 13:39:27 SAST 2000' chgrp='' chmod='' chown='' @@ -236,8 +236,8 @@ d_setpgrp='define' d_setprior='define' d_setpwent='define' d_setregid='define' -d_setresgid='undef' -d_setresuid='undef' +d_setresgid='define' +d_setresuid='define' d_setreuid='define' d_setrgid='define' d_setruid='define' @@ -323,7 +323,7 @@ freetype='void' full_ar='/usr/bin/ar' full_csh='/bin/csh' full_sed='/usr/bin/sed' -gccversion='egcs-2.91.66 19990314 (egcs-1.1.2 release)' +gccversion='2.95.2 19991024 (release)' gidtype='gid_t' glibpth='/usr/lib' grep='grep' @@ -405,16 +405,17 @@ installprivlib='/usr/libdata/perl/5.00503' installscript='/usr/local/bin' installsitearch='/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd' installsitelib='/usr/local/lib/perl5/site_perl/5.005' +installusrbinperl='undef' intsize='4' known_extensions='B DB_File Data/Dumper Fcntl GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re' ksh='' large='' ld='cc' -lddlflags='-shared' -ldflags='-Wl,-E' +lddlflags='-Wl,-E -shared -lperl -lm ' +ldflags='-Wl,-E -lperl -lm ' less='less' lib_ext='.a' -libc='/usr/lib/libc.so' +libc='' libperl='libperl.so.3' libpth='/usr/lib' libs='-lm -lc -lcrypt' @@ -455,9 +456,9 @@ modetype='mode_t' more='more' mv='' myarchname='alpha-freebsd' -mydomain='.freebsd.org' +mydomain='.FreeBSD.org' myhostname='freefall' -myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date$' +myuname='FreeBSD freefall.FreeBSD.org 4.0-current FreeBSD 4.0-current #0: $Date$' n='-n' netdb_hlen_type='int' netdb_host_type='const char *' @@ -480,7 +481,7 @@ passcat='cat /etc/passwd' patchlevel='5' path_sep=':' perl='perl' -perladmin='current@freebsd.org' +perladmin='hackers@FreeBSD.org' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' @@ -499,7 +500,7 @@ ranlib=':' rd_nodata='-1' rm='rm' rmail='' -runnm='true' +runnm='false' scriptdir='/usr/bin' scriptdirexp='/usr/bin' sed='sed' @@ -564,7 +565,7 @@ uname='uname' uniq='uniq' usedl='define' usemymalloc='n' -usenm='true' +usenm='false' useopcode='true' useperlio='undef' useposix='true' @@ -582,8 +583,8 @@ zcat='' zip='zip' # Configure command line arguments. config_arg0='Configure' -config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00503/mach -Dprivlib=/usr/libdata/perl/5.00503 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' -config_argc=11 +config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00503/mach -Dprivlib=/usr/libdata/perl/5.00503 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more' +config_argc=10 config_arg1='-Dprefix=/usr' config_arg2='-Darchlib=/usr/libdata/perl/5.00503/mach' config_arg3='-Dprivlib=/usr/libdata/perl/5.00503' @@ -591,10 +592,9 @@ config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd' config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.005' config_arg6='-Dman1dir=/usr/local/man/man1' config_arg7='-Dman3dir=/usr/share/perl/man/man3' -config_arg8='-des' -config_arg9='-Ulocincpth=' -config_arg10='-Uloclibpth=' -config_arg11='-Dpager=more' +config_arg8='-Ulocincpth=' +config_arg9='-Uloclibpth=' +config_arg10='-Dpager=/usr/bin/more' PATCHLEVEL=5 SUBVERSION=3 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 f8bd88227728..3bb4bb326488 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 +++ b/gnu/usr.bin/perl/libperl/config.SH-elf.i386 @@ -45,12 +45,12 @@ castflags='0' cat='cat' cc='cc' cccdlflags='-DPIC -fpic' -ccdlflags=' ' +ccdlflags=' -Wl,-R/usr/lib' ccflags='' -ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400002 __GNUC_MINOR__=91 __GNUC__=2 cpu=i386 machine=i386 system=FreeBSD system=unix' +ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400004 __GNUC_MINOR__=95 __GNUC__=2 cpu=i386 machine=i386 system=FreeBSD system=unix' cf_by='markm' -cf_email='markm@freebsd.org' -cf_time='$Date$' +cf_email='markm@FreeBSD.org' +cf_time='Sun Mar 5 13:39:27 SAST 2000' chgrp='' chmod='' chown='' @@ -236,8 +236,8 @@ d_setpgrp='define' d_setprior='define' d_setpwent='define' d_setregid='define' -d_setresgid='undef' -d_setresuid='undef' +d_setresgid='define' +d_setresuid='define' d_setreuid='define' d_setrgid='define' d_setruid='define' @@ -323,7 +323,7 @@ freetype='void' full_ar='/usr/bin/ar' full_csh='/bin/csh' full_sed='/usr/bin/sed' -gccversion='egcs-2.91.66 19990314 (egcs-1.1.2 release)' +gccversion='2.95.2 19991024 (release)' gidtype='gid_t' glibpth='/usr/lib' grep='grep' @@ -405,16 +405,17 @@ installprivlib='/usr/libdata/perl/5.00503' installscript='/usr/local/bin' installsitearch='/usr/local/lib/perl5/site_perl/5.005/i386-freebsd' installsitelib='/usr/local/lib/perl5/site_perl/5.005' +installusrbinperl='undef' intsize='4' known_extensions='B DB_File Data/Dumper Fcntl GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re' ksh='' large='' ld='cc' -lddlflags='-shared' -ldflags='-Wl,-E' +lddlflags='-Wl,-E -shared -lperl -lm ' +ldflags='-Wl,-E -lperl -lm ' less='less' lib_ext='.a' -libc='/usr/lib/libc.so' +libc='' libperl='libperl.so.3' libpth='/usr/lib' libs='-lm -lc -lcrypt' @@ -455,9 +456,9 @@ modetype='mode_t' more='more' mv='' myarchname='i386-freebsd' -mydomain='.freebsd.org' +mydomain='.FreeBSD.org' myhostname='freefall' -myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date$' +myuname='FreeBSD freefall.FreeBSD.org 4.0-current FreeBSD 4.0-current #0: $Date$' n='-n' netdb_hlen_type='int' netdb_host_type='const char *' @@ -480,7 +481,7 @@ passcat='cat /etc/passwd' patchlevel='5' path_sep=':' perl='perl' -perladmin='current@freebsd.org' +perladmin='hackers@FreeBSD.org' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' @@ -499,7 +500,7 @@ ranlib=':' rd_nodata='-1' rm='rm' rmail='' -runnm='true' +runnm='false' scriptdir='/usr/bin' scriptdirexp='/usr/bin' sed='sed' @@ -564,7 +565,7 @@ uname='uname' uniq='uniq' usedl='define' usemymalloc='n' -usenm='true' +usenm='false' useopcode='true' useperlio='undef' useposix='true' @@ -582,8 +583,8 @@ zcat='' zip='zip' # Configure command line arguments. config_arg0='Configure' -config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00503/mach -Dprivlib=/usr/libdata/perl/5.00503 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' -config_argc=11 +config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00503/mach -Dprivlib=/usr/libdata/perl/5.00503 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more' +config_argc=10 config_arg1='-Dprefix=/usr' config_arg2='-Darchlib=/usr/libdata/perl/5.00503/mach' config_arg3='-Dprivlib=/usr/libdata/perl/5.00503' @@ -591,10 +592,9 @@ config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd' config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.005' config_arg6='-Dman1dir=/usr/local/man/man1' config_arg7='-Dman3dir=/usr/share/perl/man/man3' -config_arg8='-des' -config_arg9='-Ulocincpth=' -config_arg10='-Uloclibpth=' -config_arg11='-Dpager=more' +config_arg8='-Ulocincpth=' +config_arg9='-Uloclibpth=' +config_arg10='-Dpager=/usr/bin/more' PATCHLEVEL=5 SUBVERSION=3 CONFIG=true 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 3d12bc09f9ff..b10abaca768d 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-threads-elf.alpha +++ b/gnu/usr.bin/perl/libperl/config.SH-threads-elf.alpha @@ -45,12 +45,12 @@ castflags='0' cat='cat' cc='cc' cccdlflags='-DPIC -fpic' -ccdlflags=' ' -ccflags='-pthread' -ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400002 __GNUC_MINOR__=91 __GNUC__=2 cpu=alpha machine=alpha system=FreeBSD system=unix' +ccdlflags=' -Wl,-R/usr/lib' +ccflags=' -pthread' +ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400004 __GNUC_MINOR__=95 __GNUC__=2 cpu=alpha machine=alpha system=FreeBSD system=unix' cf_by='markm' -cf_email='markm@freebsd.org' -cf_time='$Date$' +cf_email='markm@FreeBSD.org' +cf_time='Sun Mar 5 13:39:27 SAST 2000' chgrp='' chmod='' chown='' @@ -236,8 +236,8 @@ d_setpgrp='define' d_setprior='define' d_setpwent='define' d_setregid='define' -d_setresgid='undef' -d_setresuid='undef' +d_setresgid='define' +d_setresuid='define' d_setreuid='define' d_setrgid='define' d_setruid='define' @@ -323,7 +323,7 @@ freetype='void' full_ar='/usr/bin/ar' full_csh='/bin/csh' full_sed='/usr/bin/sed' -gccversion='egcs-2.91.66 19990314 (egcs-1.1.2 release)' +gccversion='2.95.2 19991024 (release)' gidtype='gid_t' glibpth='/usr/lib' grep='grep' @@ -405,16 +405,17 @@ installprivlib='/usr/libdata/perl/5.00503' installscript='/usr/local/bin' installsitearch='/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd' installsitelib='/usr/local/lib/perl5/site_perl/5.005' +installusrbinperl='undef' intsize='4' known_extensions='B DB_File Data/Dumper Fcntl GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re' ksh='' large='' ld='cc' -lddlflags='-shared' -ldflags='-Wl,-E -pthread' +lddlflags='-Wl,-E -shared -lperl -lm ' +ldflags='-Wl,-E -pthread -lperl -lm ' less='less' lib_ext='.a' -libc='/usr/lib/libc.so' +libc='' libperl='libperl.so.3' libpth='/usr/lib' libs='-lm -lc -lcrypt' @@ -455,9 +456,9 @@ modetype='mode_t' more='more' mv='' myarchname='alpha-freebsd' -mydomain='.freebsd.org' +mydomain='.FreeBSD.org' myhostname='freefall' -myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date$' +myuname='FreeBSD freefall.FreeBSD.org 4.0-current FreeBSD 4.0-current #0: $Date$' n='-n' netdb_hlen_type='int' netdb_host_type='const char *' @@ -480,7 +481,7 @@ passcat='cat /etc/passwd' patchlevel='5' path_sep=':' perl='perl' -perladmin='current@freebsd.org' +perladmin='hackers@FreeBSD.org' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' @@ -499,7 +500,7 @@ ranlib=':' rd_nodata='-1' rm='rm' rmail='' -runnm='true' +runnm='false' scriptdir='/usr/bin' scriptdirexp='/usr/bin' sed='sed' @@ -564,7 +565,7 @@ uname='uname' uniq='uniq' usedl='define' usemymalloc='n' -usenm='true' +usenm='false' useopcode='true' useperlio='undef' useposix='true' @@ -582,8 +583,8 @@ zcat='' zip='zip' # Configure command line arguments. config_arg0='Configure' -config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00503/mach -Dprivlib=/usr/libdata/perl/5.00503 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' -config_argc=11 +config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00503/mach -Dprivlib=/usr/libdata/perl/5.00503 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more' +config_argc=10 config_arg1='-Dprefix=/usr' config_arg2='-Darchlib=/usr/libdata/perl/5.00503/mach' config_arg3='-Dprivlib=/usr/libdata/perl/5.00503' @@ -591,10 +592,9 @@ config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd' config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.005' config_arg6='-Dman1dir=/usr/local/man/man1' config_arg7='-Dman3dir=/usr/share/perl/man/man3' -config_arg8='-des' -config_arg9='-Ulocincpth=' -config_arg10='-Uloclibpth=' -config_arg11='-Dpager=more' +config_arg8='-Ulocincpth=' +config_arg9='-Uloclibpth=' +config_arg10='-Dpager=/usr/bin/more' PATCHLEVEL=5 SUBVERSION=3 CONFIG=true 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 37711aa5de7c..7373e8a7413c 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-threads-elf.i386 +++ b/gnu/usr.bin/perl/libperl/config.SH-threads-elf.i386 @@ -45,10 +45,12 @@ castflags='0' cat='cat' cc='cc' cccdlflags='-DPIC -fpic' -ccdlflags=' ' +ccdlflags=' -Wl,-R/usr/lib' ccflags='-pthread' -ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400002 __GNUC_MINOR__=91 __GNUC__=2 cpu=i386 machine=i386 system=FreeBSD system=unix' +ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400004 __GNUC_MINOR__=95 __GNUC__=2 cpu=i386 machine=i386 system=FreeBSD system=unix' cf_by='markm' +cf_email='markm@FreeBSD.org' +cf_time='Sun Mar 5 13:39:27 SAST 2000' cf_email='markm@freebsd.org' cf_time='$Date$' chgrp='' @@ -236,8 +238,8 @@ d_setpgrp='define' d_setprior='define' d_setpwent='define' d_setregid='define' -d_setresgid='undef' -d_setresuid='undef' +d_setresgid='define' +d_setresuid='define' d_setreuid='define' d_setrgid='define' d_setruid='define' @@ -323,7 +325,7 @@ freetype='void' full_ar='/usr/bin/ar' full_csh='/bin/csh' full_sed='/usr/bin/sed' -gccversion='egcs-2.91.66 19990314 (egcs-1.1.2 release)' +gccversion='2.95.2 19991024 (release)' gidtype='gid_t' glibpth='/usr/lib' grep='grep' @@ -405,16 +407,17 @@ installprivlib='/usr/libdata/perl/5.00503' installscript='/usr/local/bin' installsitearch='/usr/local/lib/perl5/site_perl/5.005/i386-freebsd' installsitelib='/usr/local/lib/perl5/site_perl/5.005' +installusrbinperl='undef' intsize='4' known_extensions='B DB_File Data/Dumper Fcntl GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re' ksh='' large='' ld='cc' -lddlflags='-shared' -ldflags='-Wl,-E -pthread' +lddlflags='-Wl,-E -shared -lperl -lm ' +ldflags='-Wl,-E -pthread -lperl -lm ' less='less' lib_ext='.a' -libc='/usr/lib/libc.so' +libc='' libperl='libperl.so.3' libpth='/usr/lib' libs='-lm -lc -lcrypt' @@ -455,9 +458,9 @@ modetype='mode_t' more='more' mv='' myarchname='i386-freebsd' -mydomain='.freebsd.org' +mydomain='.FreeBSD.org' myhostname='freefall' -myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date$' +myuname='FreeBSD freefall.FreeBSD.org 4.0-current FreeBSD 4.0-current #0: $Date$' n='-n' netdb_hlen_type='int' netdb_host_type='const char *' @@ -480,7 +483,7 @@ passcat='cat /etc/passwd' patchlevel='5' path_sep=':' perl='perl' -perladmin='current@freebsd.org' +perladmin='hackers@FreeBSD.org' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' @@ -499,7 +502,7 @@ ranlib=':' rd_nodata='-1' rm='rm' rmail='' -runnm='true' +runnm='false' scriptdir='/usr/bin' scriptdirexp='/usr/bin' sed='sed' @@ -564,7 +567,7 @@ uname='uname' uniq='uniq' usedl='define' usemymalloc='n' -usenm='true' +usenm='false' useopcode='true' useperlio='undef' useposix='true' @@ -582,8 +585,8 @@ zcat='' zip='zip' # Configure command line arguments. config_arg0='Configure' -config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00503/mach -Dprivlib=/usr/libdata/perl/5.00503 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more' -config_argc=11 +config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00503/mach -Dprivlib=/usr/libdata/perl/5.00503 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more' +config_argc=10 config_arg1='-Dprefix=/usr' config_arg2='-Darchlib=/usr/libdata/perl/5.00503/mach' config_arg3='-Dprivlib=/usr/libdata/perl/5.00503' @@ -591,10 +594,9 @@ config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd' config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.005' config_arg6='-Dman1dir=/usr/local/man/man1' config_arg7='-Dman3dir=/usr/share/perl/man/man3' -config_arg8='-des' -config_arg9='-Ulocincpth=' -config_arg10='-Uloclibpth=' -config_arg11='-Dpager=more' +config_arg8='-Ulocincpth=' +config_arg9='-Uloclibpth=' +config_arg10='-Dpager=/usr/bin/more' PATCHLEVEL=5 SUBVERSION=3 CONFIG=true diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile index 8153ffe0e5d2..141209ee0437 100644 --- a/gnu/usr.bin/perl/perl/Makefile +++ b/gnu/usr.bin/perl/perl/Makefile @@ -8,8 +8,8 @@ CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} SRCS= perlmain.c config.h NOSHARED= no DYNALOADER= lib/auto/DynaLoader/DynaLoader.a -DPADD= ${DYNALOADER} ${LIBPERL} ${LIBM} ${LIBCRYPT} ${LIBMD} -LDADD= ${DYNALOADER} -lperl -lm -lcrypt -lmd +DPADD= ${DYNALOADER} ${LIBPERL} ${LIBM} ${LIBCRYPT} ${LIBMD} ${LIBXPG4} +LDADD= -Wl,-E ${DYNALOADER} -lperl -lm -lcrypt -lmd -lxpg4 LINKS= ${BINDIR}/${PROG} ${BINDIR}/perl5 \ ${BINDIR}/${PROG} ${BINDIR}/perl5.00503 @@ -54,7 +54,7 @@ autosplit: links Config.pm lib/*.pm lib/*/*.pm ext/${I:H}/Makefile: links ext/${I:H}/Makefile.PL cflags Config.pm config.h @cd ext/${I:H}; \ miniperl -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \ - LINKTYPE=static LIBS="-lperl"; \ + LINKTYPE=static LIBS="-lperl -lm"; \ make -B config PERL_SRC=${.OBJDIR} lib/auto/${I}.a: links ext/${I:H}/Makefile @@ -70,7 +70,7 @@ STATICS+= lib/auto/${I}.a ext/${I:H}/Makefile: links ext/${I:H}/Makefile.PL cflags Config.pm pod2man config.h @cd ext/${I:H}; \ miniperl -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \ - LINKTYPE=dynamic LIBS="-lperl" \ + LINKTYPE=dynamic LIBS="-lperl -lm" \ INST_LIB=${.OBJDIR}/build/${I:H} \ INST_ARCHLIB=${.OBJDIR}/build/${I:H}; \ make -B config PERL_SRC=${.OBJDIR} diff --git a/gnu/usr.bin/perl/suidperl/Makefile b/gnu/usr.bin/perl/suidperl/Makefile index c8d1f45de603..351f7c4f9aa8 100644 --- a/gnu/usr.bin/perl/suidperl/Makefile +++ b/gnu/usr.bin/perl/suidperl/Makefile @@ -7,8 +7,9 @@ NOMAN= true CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} -DIAMSUID SRCS= perlmain.c sperl.c config.h NOSHARED= no -DPADD= lib/auto/DynaLoader/DynaLoader.a ${LIBPERL} ${LIBM} ${LIBCRYPT} -LDADD= lib/auto/DynaLoader/DynaLoader.a -lperl -lm -lcrypt +DYNALOADER= lib/auto/DynaLoader/DynaLoader.a +DPADD= ${DYNALOADER} ${LIBPERL} ${LIBM} ${LIBCRYPT} ${LIBMD} ${LIBXPG4} +LDADD= -Wl,-E ${DYNALOADER} -lperl -lm -lcrypt -lmd -lxpg4 BINOWN= root BINMODE=4511 LINKS= ${BINDIR}/${PROG} ${BINDIR}/sperl5.00503 @@ -21,6 +22,10 @@ STATIC_EXT= DynaLoader/DynaLoader .include +MAKEMAKER_ARGS= INSTALLDIRS=perl PERL_SRC=${.OBJDIR} \ + INSTALLMAN3DIR=${DESTDIR}/usr/share/perl/man3 \ + PERL=perl FULLPERL=perl DEFINE=-I${DESTDIR}/usr/include + ${PROG}: Config.pm autosplit lib/auto/DynaLoader/DynaLoader.a sperl.c: perl.c @@ -29,7 +34,7 @@ sperl.c: perl.c Config.pm: links ${PERL5SRC}/configpm myconfig config.sh miniperl ${PERL5SRC}/configpm \ Config.pm Porting/Glossary myconfig config.sh - cd lib ; ln -sf ../${.TARGET} + @cd lib ; ln -sf ../${.TARGET} perlmain.c: config.sh writemain config.h sh writemain lib/auto/DynaLoader/DynaLoader.a > ${.TARGET} @@ -41,15 +46,14 @@ autosplit: links Config.pm lib/*.pm lib/*/*.pm touch ${.TARGET} .for I in ${STATIC_EXT} -ext/${I:H}/Makefile: links ext/${I:H}/Makefile.PL cflags Config.pm - cd ext/${I:H}; \ - miniperl -I${.OBJDIR}/lib Makefile.PL \ - LINKTYPE=static INSTALLDIRS=perl PERL_SRC=${.OBJDIR} \ - LIBS="-lperl" INSTALLMAN3DIR=${DESTDIR}/usr/share/perl/man3; \ +ext/${I:H}/Makefile: links ext/${I:H}/Makefile.PL cflags Config.pm config.h + @cd ext/${I:H}; \ + miniperl -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \ + LINKTYPE=static LIBS="-lperl -lm"; \ make -B config PERL_SRC=${.OBJDIR} lib/auto/${I}.a: links ext/${I:H}/Makefile - cd ext/${I:H}; \ + @cd ext/${I:H}; \ make -B all PERL_SRC=${.OBJDIR} all: lib/auto/${I}.a