You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@apache.org on 2002/05/23 04:44:40 UTC
cvs commit: modperl/lib/Apache ExtUtils.pm
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 Changes Path
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 -0000 1.199
+++ Makefile.PL 23 May 2002 02:44:40 -0000 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 -0000 1.24
+++ ExtUtils.pm 23 May 2002 02:44:40 -0000 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//;