dougm 02/05/22 19:35:19
Modified: . Makefile.PL
lib/Apache Build.pm
Log:
on hpux with bleedperl $Config{ld} is the fullpath, strip to the basename
Revision Changes Path
1.84 +2 -1 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- Makefile.PL 22 May 2002 02:07:08 -0000 1.83
+++ Makefile.PL 23 May 2002 02:35:19 -0000 1.84
@@ -344,8 +344,9 @@
sub os_check_hpux {
my $ccflags = $build->perl_config('ccflags');
+ my $ld = $build->perl_config('ld');
- if ($build->is_dynamic and $Config{ld} eq 'ld') {
+ if ($build->is_dynamic and $ld eq 'ld') {
unless ($ccflags =~ /\+z/i) {
$build->phat_warn(<<EOF);
mod_perl is unlikely to link with your libperl, suggestions:
1.92 +11 -1 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- Build.pm 22 May 2002 01:58:59 -0000 1.91
+++ Build.pm 23 May 2002 02:35:19 -0000 1.92
@@ -172,7 +172,9 @@
my $ldopts = ExtUtils::Embed::ldopts();
chomp $ldopts;
- if ($^O eq 'hpux' and $Config{ld} eq 'ld') {
+ my $ld = $self->perl_config('ld');
+
+ if ($^O eq 'hpux' and $ld eq 'ld') {
while ($ldopts =~ s/-Wl,(\S+)/$1/) {
my $cp = $1;
(my $repl = $cp) =~ s/,/ /g;
@@ -275,6 +277,14 @@
}
$val;
+}
+
+sub perl_config_ld {
+ my($self, $val) = @_;
+
+ $val ||= $Config{ld};
+
+ basename $val; #bleedperl hpux value is /usr/bin/ld !
}
sub perl_config_lddlflags {