Allow libperl to be a shared library.

This has the delightful side effect of fixing ELF .so objects.

Asked-for-by: peter

5 files changed, 12 insertions, 8 deletions

diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc
index d9dfb73..3c89259 100644
--- a/gnu/usr.bin/perl/Makefile.inc
+++ b/gnu/usr.bin/perl/Makefile.inc
@@ -1,5 +1,8 @@
-#	$Id$
+#	$Id: Makefile.inc,v 1.3 1998/09/09 07:20:10 markm Exp $
 
 PERL5SRC?= ${.CURDIR}/../../../../contrib/perl5
 
 BINDIR?=	/usr/bin
+
+SHLIB_MAJOR?=	3
+SHLIB_MINOR?=	0
diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile
index f4b07f5..3c43000 100644
--- a/gnu/usr.bin/perl/libperl/Makefile
+++ b/gnu/usr.bin/perl/libperl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1 1998/09/09 07:20:25 markm Exp $
+# $Id: Makefile,v 1.2 1998/09/12 15:45:29 markm Exp $
 #
 
 LIB=	perl
@@ -11,7 +11,7 @@ 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
 
-NOPIC=	true
+# NOPIC=	true
 
 beforeinstall beforedepend all: config.h config.sh
 
@@ -21,7 +21,7 @@ CLEANFILES+=	config.h config.sh config_h.sh
 
 .SUFFIXES:
 
-.SUFFIXES: .a .c .h .o .po .sh
+.SUFFIXES: .o .po .so .s .S .c
 
 .PATH:	${PERL5SRC}
 
diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile
index a6e6817..3b9854d 100644
--- a/gnu/usr.bin/perl/miniperl/Makefile
+++ b/gnu/usr.bin/perl/miniperl/Makefile
@@ -6,6 +6,7 @@ PROG=	miniperl
 NOMAN=	true
 CFLAGS+=-I${PERL5SRC} -I${.OBJDIR}
 SRCS=	miniperlmain.c config.h
+NOSHARED=true
 DPADD=	${LIBPERL} ${LIBM} ${LIBCRYPT}
 LDADD=	-lperl -lm -lcrypt
 
diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile
index f642de4..4a9c7f1 100644
--- a/gnu/usr.bin/perl/perl/Makefile
+++ b/gnu/usr.bin/perl/perl/Makefile
@@ -38,13 +38,13 @@ config.h: config_h.sh config.sh
 	sh config_h.sh
 
 config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}
-	cp -p ${.OODATE} ${.TARGET}
+	cp ${.OODATE} ${.TARGET}
 
 config_h.sh: config_h.SH
-	cp -p ${.OODATE} ${.TARGET}
+	cp ${.OODATE} ${.TARGET}
 
 cflags.sh: cflags.SH
-	cp -p ${.OODATE} ${.TARGET}
+	cp ${.OODATE} ${.TARGET}
 
 cflags: cflags.sh
 	sh ${.OODATE}
diff --git a/gnu/usr.bin/perl/x2p/a2pl/Makefile b/gnu/usr.bin/perl/x2p/a2pl/Makefile
index 254dc27..ec38334 100644
--- a/gnu/usr.bin/perl/x2p/a2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/a2pl/Makefile
@@ -4,7 +4,7 @@
 
 PROG=	a2p
 CFLAGS+=-I${PERL5SRC}/x2p -I${.OBJDIR} -I${.OBJDIR}/temp
-LDFLAGS+=-lperl
+LDFLAGS+=-lperl -lm -lcrypt
 SRCS=	a2p.c hash.c str.c util.c walk.c config.h
 
 beforedepend all: config.h temp