If we are building with perl, then create libcyrus.a, libacap.a, and

libsieve.a from relocatable objects so that when the Perl modules are
linked against these libraries, they are composed wholly from relocatable
objects.  We query perl for how to compile a source file into a relocatable
object file.  This should fix pkg/16089.

5 files changed, 77 insertions, 5 deletions

diff --git a/mail/cyrus-imapd/patches/patch-af b/mail/cyrus-imapd/patches/patch-af
index 995bf64afee..de12d73a8ea 100644
--- a/mail/cyrus-imapd/patches/patch-af
+++ b/mail/cyrus-imapd/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2002/10/21 06:12:54 jlam Exp $
+$NetBSD: patch-af,v 1.5 2002/11/01 00:26:30 jlam Exp $
 
 --- configure.orig	Fri Jul 27 19:53:11 2001
 +++ configure
@@ -67,14 +67,24 @@ $NetBSD: patch-af,v 1.4 2002/10/21 06:12:54 jlam Exp $
  for ac_prog in mawk gawk nawk awk
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -4179,6 +4157,44 @@ fi
+@@ -2284,6 +2262,9 @@ if test "$with_perl" = "no"; then
+ else
+     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
+     PERL_SUBDIRS="imap"
++    eval `${PERL} -V:cccdlflags`
++    PERL_CCCDLFLAGS="$cccdlflags"
++    
+ fi
+ 
+ if test "$sievedir" != "no"; then
+@@ -4179,6 +4160,44 @@ fi
  
  	SASLFLAGS=""
  	LIB_SASL=""
 +	# Extract the first word of "sasl-config", so it can be a program name with args.
 +set dummy sasl-config; ac_word=$2
 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:4164: checking for $ac_word" >&5
++echo "configure:4167: checking for $ac_word" >&5
 +if eval "test \"`echo '$''{'ac_cv_path_SASL_CONFIG'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
@@ -112,7 +122,7 @@ $NetBSD: patch-af,v 1.4 2002/10/21 06:12:54 jlam Exp $
  
  	cmu_saved_CPPFLAGS=$CPPFLAGS
  	cmu_saved_LDFLAGS=$LDFLAGS
-@@ -4277,6 +4293,15 @@ fi
+@@ -4277,6 +4296,15 @@ fi
  	  LIB_SASL=""
  	  SASLFLAGS=""
  	fi
@@ -128,7 +138,15 @@ $NetBSD: patch-af,v 1.4 2002/10/21 06:12:54 jlam Exp $
  	
  	
  	
-@@ -5084,6 +5109,7 @@ s%@COMPILE_ET@%$COMPILE_ET%g
+@@ -5066,6 +5094,7 @@ s%@YACC@%$YACC%g
+ s%@LEX@%$LEX%g
+ s%@LEXLIB@%$LEXLIB%g
+ s%@PERL@%$PERL%g
++s%@PERL_CCCDLFLAGS@%$PERL_CCCDLFLAGS%g
+ s%@WITH_NONBLOCK@%$WITH_NONBLOCK%g
+ s%@WITH_GMTOFF@%$WITH_GMTOFF%g
+ s%@WITH_MAP@%$WITH_MAP%g
+@@ -5084,6 +5113,7 @@ s%@COMPILE_ET@%$COMPILE_ET%g
  s%@COM_ERR_LIBS@%$COM_ERR_LIBS%g
  s%@COM_ERR_LDFLAGS@%$COM_ERR_LDFLAGS%g
  s%@COM_ERR_CPPFLAGS@%$COM_ERR_CPPFLAGS%g
diff --git a/mail/cyrus-imapd/patches/patch-ak b/mail/cyrus-imapd/patches/patch-ak
new file mode 100644
index 00000000000..603669fa14f
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.3 2002/11/01 00:26:30 jlam Exp $
+
+--- configure.in.orig	Fri Jun 22 21:01:47 2001
++++ configure.in
+@@ -180,6 +180,10 @@ dnl compile perl stuff
+     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
+ dnl and compile perl/cyradm
+     PERL_SUBDIRS="imap"
++dnl add perl cccdlflags when building libraries
++    eval `${PERL} -V:cccdlflags`
++    PERL_CCCDLFLAGS="$cccdlflags"
++    AC_SUBST(PERL_CCCDLFLAGS)
+ fi
+ 
+ dnl for timsieved
diff --git a/mail/cyrus-imapd/patches/patch-al b/mail/cyrus-imapd/patches/patch-al
new file mode 100644
index 00000000000..8d892d5957e
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2002/11/01 00:26:30 jlam Exp $
+
+--- acap/Makefile.in.orig	Thu Oct 31 19:16:25 2002
++++ acap/Makefile.in
+@@ -53,7 +53,7 @@ DEFS = @DEFS@
+ CPPFLAGS = @CPPFLAGS@ @SASLFLAGS@ -I. -I..
+ LIBS = @LIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd/patches/patch-am b/mail/cyrus-imapd/patches/patch-am
new file mode 100644
index 00000000000..26d9e6dd73c
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2002/11/01 00:26:30 jlam Exp $
+
+--- lib/Makefile.in.orig	Tue Aug 22 22:47:57 2000
++++ lib/Makefile.in
+@@ -58,7 +58,7 @@ DEFS = @DEFS@
+ CPPFLAGS = -I.. @CPPFLAGS@ @SASLFLAGS@
+ LIBS = @LIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd/patches/patch-an b/mail/cyrus-imapd/patches/patch-an
new file mode 100644
index 00000000000..0b105b6f7f9
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2002/11/01 00:26:30 jlam Exp $
+
+--- sieve/Makefile.in.orig	Thu Mar  8 20:35:41 2001
++++ sieve/Makefile.in
+@@ -35,7 +35,7 @@ COMPILE_ET = @COMPILE_ET@
+ 
+ DEFS = @DEFS@
+ CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ MAKEDEPEND = @MAKEDEPEND@