cvs commit: modperl/lib/Apache ExtUtils.pm

[dougm]

dougm   02/05/22 19:44:40

  Modified:.Makefile.PL
   lib/Apache ExtUtils.pm
  Log:
  on hpux with bleedperl $Config{ld} is the fullpath, strip to the basename
  
  Revision  ChangesPath
  1.200 +4 -2  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.199
  retrieving revision 1.200
  diff -u -r1.199 -r1.200
  --- Makefile.PL   24 Mar 2002 19:06:03 -  1.199
  +++ Makefile.PL   23 May 2002 02:44:40 -  1.200
   -19,7 +19,7 
   use FileHandle ();
   use DirHandle ();
   use File::Compare ();
  -use File::Basename qw(dirname);
  +use File::Basename qw(dirname basename);
   use File::Path qw(mkpath rmtree);
   use Cwd;
   use File::Copy qw(cp);
   -2398,7 +2398,9 
}
   }
   
  -if ($^O eq 'hpux' and ($USE_DSO or $USE_APXS) and $Config{ld} eq 'ld') {
  +my $ld = basename $Config{ld};
  +
  +if ($^O eq 'hpux' and ($USE_DSO or $USE_APXS) and $ld eq 'ld') {
   unless ($ccflags =~ /\+z/i) {
   my $switch = $] = 5.006 ? 'A' : 'D';
   phat_warn(EOF);
  
  
  
  1.25  +2 -0  modperl/lib/Apache/ExtUtils.pm
  
  Index: ExtUtils.pm
  ===
  RCS file: /home/cvs/modperl/lib/Apache/ExtUtils.pm,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ExtUtils.pm   24 Mar 2002 19:06:03 -  1.24
  +++ ExtUtils.pm   23 May 2002 02:44:40 -  1.25
   -4,6 +4,7 
   use Exporter ();
   use IO::File ();
   use File::Copy ();
  +use File::Basename qw(basename);
   
   $Apache::ExtUtils::VERSION = '1.04';
   
   -35,6 +36,7 
   sub Config_pm_fixup {
   eval { require Apache::MyConfig; };
   my %config_fixups = (
  +   ld = sub { s/(.*)/basename $1/e },
  ccdlflags = sub { s/-R\s+/-R/; },
  ccflags = sub {
  s/-D_GNU_SOURCE//;
  
  
  

cvs commit: modperl/lib/Apache ExtUtils.pm

[dougm]

dougm   02/03/24 11:06:03

  Modified:.Changes Makefile.PL
   lib/Apache ExtUtils.pm
  Log:
  Submitted by: stas
  Reviewed by:dougm
  rip -D_GNU_SOURCE out of Perl 5.7.3+'s ccflags, which modperl doesn't
  need and apache won't compile with
  
  Revision  ChangesPath
  1.629 +3 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.628
  retrieving revision 1.629
  diff -u -r1.628 -r1.629
  --- Changes   24 Mar 2002 18:22:56 -  1.628
  +++ Changes   24 Mar 2002 19:06:03 -  1.629
  @@ -10,6 +10,9 @@
   
   =item 1.26_01-dev
   
  +rip -D_GNU_SOURCE out of Perl 5.7.3+'s ccflags, which modperl doesn't
  +need and apache won't compile with [Stas Bekman [EMAIL PROTECTED]]
  +
   make sure PerlSetEnv variables are visible after first access
   to each child [Geoff Young [EMAIL PROTECTED]]
   
  
  
  
  1.199 +3 -0  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.198
  retrieving revision 1.199
  diff -u -r1.198 -r1.199
  --- Makefile.PL   24 Mar 2002 02:07:58 -  1.198
  +++ Makefile.PL   24 Mar 2002 19:06:03 -  1.199
  @@ -386,6 +386,9 @@
   $PERL_EXTRA_CFLAGS .=  $Config{ccflags};
   }
   
  +# apache-1.3.xx won't compile with -D_GNU_SOURCE
  +$PERL_EXTRA_CFLAGS =~ s/-D_GNU_SOURCE//;
  +
   for (keys %PassEnv) {
   $ENV{$_} = $$_ if $$_;
   }
  
  
  
  1.24  +1 -0  modperl/lib/Apache/ExtUtils.pm
  
  Index: ExtUtils.pm
  ===
  RCS file: /home/cvs/modperl/lib/Apache/ExtUtils.pm,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ExtUtils.pm   25 Aug 2001 19:55:03 -  1.23
  +++ ExtUtils.pm   24 Mar 2002 19:06:03 -  1.24
  @@ -37,6 +37,7 @@
   my %config_fixups = (
  ccdlflags = sub { s/-R\s+/-R/; },
  ccflags = sub {
  +   s/-D_GNU_SOURCE//;
  unless ($Apache::MyConfig::Setup{PERL_USELARGEFILES}) {
  s/-D_LARGEFILE_SOURCE\s+-D_FILE_OFFSET_BITS=\d+//;
  }