perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: modperl/apaci mod_perl.config.sh
Date Fri, 26 Jan 2001 06:04:28 GMT
dougm       01/01/25 22:04:27

  Modified:    .        Makefile.PL ToDo Changes
               apaci    mod_perl.config.sh
  Log:
  DSO support for hpux with native cc/ld
  
  Revision  Changes    Path
  1.176     +11 -0     modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.175
  retrieving revision 1.176
  diff -u -r1.175 -r1.176
  --- Makefile.PL	2000/12/31 19:34:16	1.175
  +++ Makefile.PL	2001/01/26 06:04:21	1.176
  @@ -2306,6 +2306,17 @@
   	}
       }
   
  +    if ($^O eq 'hpux' and ($USE_DSO or $USE_APXS) and $Config{ld} eq 'ld') {
  +        unless ($ccflags =~ /\+z/i) {
  +            my $switch = $] >= 5.006 ? 'A' : 'D';
  +            phat_warn(<<EOF);
  +mod_perl is unlikely to link with your libperl, suggestions:
  +    *) Rebuild Perl with Configure -${switch}ccflags=+Z ...
  +    *) Build mod_perl static rather than DSO
  +EOF
  +        }
  +    }
  +
       gdbm_check();
       malloc_check();
       uselargefiles_check();
  
  
  
  1.270     +0 -2      modperl/ToDo
  
  Index: ToDo
  ===================================================================
  RCS file: /home/cvs/modperl/ToDo,v
  retrieving revision 1.269
  retrieving revision 1.270
  diff -u -r1.269 -r1.270
  --- ToDo	2001/01/25 08:10:15	1.269
  +++ ToDo	2001/01/26 06:04:22	1.270
  @@ -3,8 +3,6 @@
                    (well, close to it anyhow)
   ---------------------------------------------------------------------------
   
  -- hpux dso troubles
  -
   - Makefile.PL if $PERL_USELARGEFILES == 0, check apxs cflags
   
   - From: Andy Wardley <abw@cre.canon.co.uk>
  
  
  
  1.574     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.573
  retrieving revision 1.574
  diff -u -r1.573 -r1.574
  --- Changes	2001/01/25 08:10:15	1.573
  +++ Changes	2001/01/26 06:04:23	1.574
  @@ -10,6 +10,8 @@
   
   =item 1.24_02-dev
   
  +DSO support for hpux with native cc
  +
   document Apache->server->register_cleanup
   [Perrin Harkins <perrin@primenet.com>]
   
  
  
  
  1.22      +6 -8      modperl/apaci/mod_perl.config.sh
  
  Index: mod_perl.config.sh
  ===================================================================
  RCS file: /home/cvs/modperl/apaci/mod_perl.config.sh,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_perl.config.sh	2000/12/23 02:23:09	1.21
  +++ mod_perl.config.sh	2001/01/26 06:04:26	1.22
  @@ -139,21 +139,19 @@
   # other systems, but it bites us on BSD/OS 4.x
   $ldopts =~ s@$Config{ccdlflags}@@ if ($^O eq 'bsdos');
   $ldopts =~ s,(-bE:)(perl\.exp),$1$Config{archlibexp}/CORE/$2, if($^O eq "aix");
  -=pod
  -#replace -Wl args meant for gcc with args for ld
  -#hmm, this breaks USE_APACI=1, what to do for USE_APXS?
  -#should we use gcc instead of ld?
  -if($^O eq "hpux") {
  +
  +#replace -Wl args meant for cc with args for ld
  +if ($ARGV[0] eq "DSO" and $^O eq "hpux" and $Config{ld} eq "ld") {
       while ($ldopts =~ s/-Wl,(\S+)/$1/) {
   	my $cp = $1;
   	(my $repl = $cp) =~ s/,/ /g;
  -	$ldopts =~ s/$cp/$repl/;
  +	$ldopts =~ s/\Q$cp/$repl/;
       }
   }
  -=cut
  +
   print $ldopts;
   EOT
  -perl_libs="`$perl_interp $tmpfile2 $perl_libperl`"
  +perl_libs="`$perl_interp $tmpfile2 $build_type`"
   if test $build_type = OBJ
   then
   	case "$os_version" in
  
  
  

Mime
View raw message