From 0a294a14a19e617106c774313b3d90dce1fbf53e Mon Sep 17 00:00:00 2001
From: tv <tv@pkgsrc.org>
Date: Sat, 1 May 1999 00:42:29 +0000
Subject: Link in the DynaLoader so that libperl works when loaded into apache.

---
 www/ap-perl/Makefile         |  4 +++-
 www/ap-perl/patches/patch-aa | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'www/ap-perl')

diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index e48041924c3..f1a3b1d9832 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/04/30 17:05:21 tv Exp $
+# $NetBSD: Makefile,v 1.5 1999/05/01 00:42:29 tv Exp $
 #
 
 DISTNAME=       	mod_perl-1.19
@@ -13,6 +13,8 @@ DEPENDS=		libperl-5.00404:../../lang/libperl \
 			apache-1.3.6p0:../../www/apache
 USE_PERL5=		yes
 
+MAKE_ENV=		DYNALOADER_OBJ_PIC="${PREFIX}/lib/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/5.00404/DynaLoader_pic.o"
+
 do-configure:
 	@cd ${WRKSRC} && ${PREFIX}/bin/perl Makefile.PL USE_APXS=1 \
 		WITH_APXS=${PREFIX}/sbin/apxs EVERYTHING=1
diff --git a/www/ap-perl/patches/patch-aa b/www/ap-perl/patches/patch-aa
index 0e3b141ce26..e2a5baf8741 100644
--- a/www/ap-perl/patches/patch-aa
+++ b/www/ap-perl/patches/patch-aa
@@ -1,5 +1,16 @@
---- apaci/Makefile.tmpl.orig	Mon Apr 26 18:22:37 1999
-+++ apaci/Makefile.tmpl	Mon Apr 26 18:32:27 1999
+$NetBSD: patch-aa,v 1.3 1999/05/01 00:42:30 tv Exp $
+
+--- apaci/Makefile.tmpl.orig	Tue Nov 24 11:38:52 1998
++++ apaci/Makefile.tmpl	Fri Apr 30 20:36:05 1999
+@@ -45,7 +45,7 @@
+    $(MP_STATIC_OBJS)
+ MP_OBJS_PIC=\
+    mod_perl.lo perlxsi.lo perl_config.lo perl_util.lo perlio.lo mod_perl_opmask.lo \
+-   $(MP_STATIC_OBJS_PIC)
++   $(MP_STATIC_OBJS_PIC) $(DYNALOADER_OBJ_PIC)
+ 
+ all: lib
+ 
 @@ -58,7 +58,7 @@
  
  libperl.so: $(MP_OBJS_PIC)
-- 
cgit v1.2.3