svn commit: r124833 - /perl/modperl/trunk/Changes /perl/modperl/trunk/lib/Apache/Build.pm

[stas]

Author: stas
Date: Mon Jan 10 13:53:53 2005
New Revision: 124833

URL: http://svn.apache.org/viewcvs?view=rev&rev=124833
Log:
on Irix mod_perl.so needs to see the libperl.so symbols, which
requires the -exports option immediately before -lperl.
Contributed by: Gordon Lack <[EMAIL PROTECTED]>

Modified:
   perl/modperl/trunk/Changes
   perl/modperl/trunk/lib/Apache/Build.pm

Modified: perl/modperl/trunk/Changes
Url: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&rev=124833&p1=perl/modperl/trunk/Changes&r1=124832&p2=perl/modperl/trunk/Changes&r2=124833
==============================================================================
--- perl/modperl/trunk/Changes  (original)
+++ perl/modperl/trunk/Changes  Mon Jan 10 13:53:53 2005
@@ -12,6 +12,10 @@
 
 =item 1.999_21-dev
 
+on Irix mod_perl.so needs to see the libperl.so symbols, which
+requires the -exports option immediately before -lperl.  [Gordon Lack
+<[EMAIL PROTECTED]>]
+
 pool arguments to startup and connection callbacks must be blessed
 into APR::Pool and not Apache::Pool class [joes]
 

Modified: perl/modperl/trunk/lib/Apache/Build.pm
Url: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache/Build.pm?view=diff&rev=124833&p1=perl/modperl/trunk/lib/Apache/Build.pm&r1=124832&p2=perl/modperl/trunk/lib/Apache/Build.pm&r2=124833
==============================================================================
--- perl/modperl/trunk/lib/Apache/Build.pm      (original)
+++ perl/modperl/trunk/lib/Apache/Build.pm      Mon Jan 10 13:53:53 2005
@@ -28,6 +28,7 @@
 
 use constant AIX    => $^O eq 'aix';
 use constant DARWIN => $^O eq 'darwin';
+use constant IRIX    => $^O eq 'irix';
 use constant HPUX   => $^O eq 'hpux';
 use constant OPENBSD => $^O eq 'openbsd';
 use constant WIN32  => $^O eq 'MSWin32';
@@ -441,6 +442,13 @@
     }
 
     $config->{ldflags} = $ldflags; #reset
+
+    # on Irix mod_perl.so needs to see the libperl.so symbols, which
+    # requires the -exports option immediately before -lperl.
+    if (IRIX) {
+        ($ldopts =~ s/-lperl\b/-exports -lperl/)
+            or warn "Failed to fix Irix symbol exporting\n";
+    }
 
     $ldopts;
 }