diff options
author | markm <markm@FreeBSD.org> | 1999-09-04 10:02:04 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 1999-09-04 10:02:04 +0000 |
commit | f863534104d0464925c158745c9412196654311a (patch) | |
tree | c022bff394d36f8d58b4c4d8fa911a9a51de5ef7 /gnu | |
parent | 3f27ca11404bfee6ad95039f41fe9625062bf654 (diff) | |
download | FreeBSD-src-f863534104d0464925c158745c9412196654311a.zip FreeBSD-src-f863534104d0464925c158745c9412196654311a.tar.gz |
Allow perl to be built with thread support.
Submitted by: Doug Ambrisko <ambrisko@whistle.com>
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/usr.bin/perl/Makefile.inc | 3 | ||||
-rw-r--r-- | gnu/usr.bin/perl/libperl/Makefile | 15 | ||||
-rw-r--r-- | gnu/usr.bin/perl/libperl/config.SH-elf.alpha | 14 | ||||
-rw-r--r-- | gnu/usr.bin/perl/libperl/config.SH-elf.i386 | 14 | ||||
-rw-r--r-- | gnu/usr.bin/perl/miniperl/Makefile | 20 | ||||
-rw-r--r-- | gnu/usr.bin/perl/perl/Makefile | 14 | ||||
-rw-r--r-- | gnu/usr.bin/perl/suidperl/Makefile | 11 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/a2pl/Makefile | 18 |
8 files changed, 87 insertions, 22 deletions
diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc index 7c36011..b2847c8 100644 --- a/gnu/usr.bin/perl/Makefile.inc +++ b/gnu/usr.bin/perl/Makefile.inc @@ -47,8 +47,7 @@ linkfarm: ${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 ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}.${MACHINE_ARCH} \ - config.sh + @ln -sf ${CANONICALOBJDIR}/../libperl/config.sh config.sh @touch ${.TARGET} CLEANFILES+= linkfarm diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile index 7f264b8..22101c0 100644 --- a/gnu/usr.bin/perl/libperl/Makefile +++ b/gnu/usr.bin/perl/libperl/Makefile @@ -19,6 +19,16 @@ CLEANFILES+= config.h config.sh config_h.sh .include <bsd.lib.mk> +PERL_THREADED?= no +.if ${PERL_THREADED} == "true" +CFLAGS+= -pthread +.endif + +PERL_DEBUGGING?= no +.if ${PERL_DEBUGGING} == "true" +CFLAGS+= -DDEBUGGING +.endif + .SUFFIXES: .SUFFIXES: .o .po .So .s .S .c @@ -28,8 +38,13 @@ CLEANFILES+= config.h config.sh config_h.sh config.h: config_h.sh config.sh sh config_h.sh +.if ${PERL_THREADED} == "true" +config.sh: config.SH-threads-${OBJFORMAT}.${MACHINE_ARCH} + ln -sf ${.OODATE} ${.TARGET} +.else config.sh: config.SH-${OBJFORMAT}.${MACHINE_ARCH} ln -sf ${.OODATE} ${.TARGET} +.endif config_h.sh: config_h.SH ln -sf ${.OODATE} ${.TARGET} diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha index 8983906..c8f9d0a 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha +++ b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha @@ -5,18 +5,18 @@ # Package name : perl5 # Source directory : . -# Configuration time: $Date: 1999/05/05 19:09:48 $ +# Configuration time: $Date$ # Configured by : markm -# Target system : freebsd 3.0-current #0: +# Target system : freebsd 4.0-current #0: Author='' -Date='$Date: 1999/05/05 19:09:48 $' +Date='$Date$' Header='' Id='$FreeBSD$' Locker='' Mcc='Mcc' -RCSfile='$RCSfile: config.SH-elf.alpha,v $' -Revision='$Revision: 1.13 $' +RCSfile='$RCSfile$' +Revision='$Revision$' Source='' State='' _a='.a' @@ -50,7 +50,7 @@ ccflags='' ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400002 __GNUC_MINOR__=91 __GNUC__=2 cpu=alpha machine=alpha system=FreeBSD system=unix' cf_by='markm' cf_email='markm@freebsd.org' -cf_time='$Date: 1999/05/05 19:09:48 $' +cf_time='$Date$' chgrp='' chmod='' chown='' @@ -457,7 +457,7 @@ mv='' myarchname='alpha-freebsd' mydomain='.freebsd.org' myhostname='freefall' -myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date: 1999/05/05 19:09:48 $' +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 *' diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 b/gnu/usr.bin/perl/libperl/config.SH-elf.i386 index 53eb9c7..f8bd882 100644 --- a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 +++ b/gnu/usr.bin/perl/libperl/config.SH-elf.i386 @@ -5,18 +5,18 @@ # Package name : perl5 # Source directory : . -# Configuration time: $Date: 1999/05/05 19:09:48 $ +# Configuration time: $Date$ # Configured by : markm -# Target system : freebsd 3.0-current #0: +# Target system : freebsd 4.0-current #0: Author='' -Date='$Date: 1999/05/05 19:09:48 $' +Date='$Date$' Header='' Id='$FreeBSD$' Locker='' Mcc='Mcc' -RCSfile='$RCSfile: config.SH-elf.i386,v $' -Revision='$Revision: 1.12 $' +RCSfile='$RCSfile$' +Revision='$Revision$' Source='' State='' _a='.a' @@ -50,7 +50,7 @@ ccflags='' ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400002 __GNUC_MINOR__=91 __GNUC__=2 cpu=i386 machine=i386 system=FreeBSD system=unix' cf_by='markm' cf_email='markm@freebsd.org' -cf_time='$Date: 1999/05/05 19:09:48 $' +cf_time='$Date$' chgrp='' chmod='' chown='' @@ -457,7 +457,7 @@ mv='' myarchname='i386-freebsd' mydomain='.freebsd.org' myhostname='freefall' -myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date: 1999/05/05 19:09:48 $' +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 *' diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile index e072d5e..33985ec 100644 --- a/gnu/usr.bin/perl/miniperl/Makefile +++ b/gnu/usr.bin/perl/miniperl/Makefile @@ -19,15 +19,29 @@ CLEANFILES= config.h config.sh config_h.sh .include <bsd.prog.mk> +PERL_THREADED?= no +.if ${PERL_THREADED} == "true" +CFLAGS+= -pthread +LDADD+= -pthread +.endif + +PERL_DEBUGGING?= no +.if ${PERL_DEBUGGING} == "true" +CFLAGS+= -DDEBUGGING +.endif + miniperlmain.o: config.h config.h: config_h.sh config.sh sh config_h.sh -config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}.${MACHINE_ARCH} - @ln -sf ${.OODATE} ${.TARGET} +${.CURDIR}/../libperl/config.sh: + cd ${.CURDIR}/../libperl ; make config.sh + +config.sh: ${.CURDIR}/../libperl/config.sh + ln -sf ${CANONICALOBJDIR}/../libperl/config.sh ${.TARGET} config_h.sh: config_h.SH - @ln -sf ${.OODATE} ${.TARGET} + ln -sf ${.OODATE} ${.TARGET} .PATH: ${PERL5SRC} diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile index 7523f09..188c606 100644 --- a/gnu/usr.bin/perl/perl/Makefile +++ b/gnu/usr.bin/perl/perl/Makefile @@ -27,12 +27,24 @@ NONXS_EXT= Errno/pm_to_blib .include <bsd.prog.mk> +PERL_THREADED?= no +.if ${PERL_THREADED} == "true" +DYNAMIC_EXT+= Thread/Thread +CFLAGS+= -pthread +LDADD+= -pthread +.endif + +PERL_DEBUGGING?= no +.if ${PERL_DEBUGGING} == "true" +CFLAGS+= -DDEBUGGING +.endif + ${PROG}: linkfarm Config.pm autosplit lib/auto/DynaLoader/DynaLoader.a config_h.sh config.sh cflags.sh writemain.sh: linkfarm config.h: linkfarm config_h.sh config.sh - sh config_h.sh + sh -x config_h.sh cflags: linkfarm cflags.sh sh cflags.sh diff --git a/gnu/usr.bin/perl/suidperl/Makefile b/gnu/usr.bin/perl/suidperl/Makefile index 8a0cea8..6038280 100644 --- a/gnu/usr.bin/perl/suidperl/Makefile +++ b/gnu/usr.bin/perl/suidperl/Makefile @@ -22,6 +22,17 @@ STATIC_EXT= DynaLoader/DynaLoader .include <bsd.prog.mk> +PERL_THREADED?= no +.if ${PERL_THREADED} == "true" +CFLAGS+= -pthread +LDADD+= -pthread +.endif + +PERL_DEBUGGING?= no +.if ${PERL_DEBUGGING} == "true" +CFLAGS+= -DDEBUGGING +.endif + ${PROG}: linkfarm Config.pm autosplit lib/auto/DynaLoader/DynaLoader.a sperl.c: perl.c diff --git a/gnu/usr.bin/perl/x2p/a2pl/Makefile b/gnu/usr.bin/perl/x2p/a2pl/Makefile index 005496f..041ba03 100644 --- a/gnu/usr.bin/perl/x2p/a2pl/Makefile +++ b/gnu/usr.bin/perl/x2p/a2pl/Makefile @@ -11,6 +11,17 @@ beforedepend all: config.h temp .include <bsd.prog.mk> +PERL_THREADED?= no +.if ${PERL_THREADED} == "true" +CFLAGS+= -pthread +LDADD+= -pthread +.endif + +PERL_DEBUGGING?= no +.if ${PERL_DEBUGGING} == "true" +CFLAGS+= -DDEBUGGING +.endif + .PATH: ${PERL5SRC}/x2p .PATH: ${PERL5SRC} @@ -25,8 +36,11 @@ CLEANFILES+= config.h config_h.sh config.sh ${PROG}.1 config.h: config_h.sh config.sh sh config_h.sh -config.sh: ${.CURDIR}/../../libperl/config.SH-${OBJFORMAT}.${MACHINE_ARCH} - ln -sf ${.OODATE} ${.TARGET} +${.CURDIR}/../../libperl/config.sh: + cd ${.CURDIR}/../../libperl ; make config.sh + +config.sh: ${.CURDIR}/../../libperl/config.sh + ln -sf ${CANONICALOBJDIR}/../../libperl/config.sh ${.TARGET} config_h.sh: ${PERL5SRC}/config_h.SH ln -sf ${.OODATE} ${.TARGET} |