SOURCES: perl-ExtUtils-F77-gcc.patch - update for 1.16

[sls]

Author: sls                          Date: Fri Mar 28 10:15:33 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update for 1.16

---- Files affected:
SOURCES:
   perl-ExtUtils-F77-gcc.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/perl-ExtUtils-F77-gcc.patch
diff -u SOURCES/perl-ExtUtils-F77-gcc.patch:1.2 SOURCES/perl-ExtUtils-F77-gcc.patch:1.3
--- SOURCES/perl-ExtUtils-F77-gcc.patch:1.2	Sun Nov  2 17:41:36 2003
+++ SOURCES/perl-ExtUtils-F77-gcc.patch	Fri Mar 28 11:15:28 2008
@@ -1,38 +1,38 @@
---- ExtUtils-F77-1.14/F77.pm.orig	2001-06-15 22:04:17.000000000 +0200
-+++ ExtUtils-F77-1.14/F77.pm	2003-11-02 17:26:13.036832848 +0100
-@@ -137,19 +137,23 @@
-     my @libs = ('g2c', 'f2c');
-     my ($dir, $lib, $test);
-     foreach $test (@libs) {
--      $dir = `g77 -print-file-name=lib$test.a`;
-+      foreach $ext ('.so', '.a') {
-+      $dir = `g77 -print-file-name=lib$test$ext`;
-       chomp $dir;
-       # Note that -print-file-name returns just the library name
-       # if it cant be found - make sure that we only accept the
-       # directory if it returns a proper path (or matches a /)
--      if (defined $dir && $dir ne "lib$test.a") {
-+      if (defined $dir && $dir ne "lib$test$ext") {
-         $lib = $test; # Found an existing library
-         last; 
-       }
-+      }
-+      last if (defined $lib);
-     }
- 
-     if( defined $dir  && defined $lib) {
--        $dir =~ s,/lib$lib.a$,,;
-+        $dir =~ s,/lib$lib\..*$,,;
-+	$dir = `cd $dir ; pwd`; # sanitize
-     } else {
-         $dir = "/usr/local/lib";
-         $lib = "f2c";
-@@ -158,7 +162,7 @@
- };
- $F77config{Generic}{G77}{Trail_} = 1;
- $F77config{Generic}{G77}{Compiler} = find_in_path('g77','f77','fort77');
--$F77config{Generic}{G77}{Cflags} = '-O';
-+$F77config{Generic}{G77}{Cflags} = "$Config{'optimize'}";
- $F77config{Generic}{DEFAULT} = 'G77';
- $F77config{Generic}{F2c}     = $F77config{Generic}{G77};
- 
+--- ExtUtils-F77-1.16/F77.pm.orig	2007-04-02 06:40:23.000000000 +0200
++++ ExtUtils-F77-1.16/F77.pm	2008-03-28 10:20:31.965651075 +0100
+@@ -173,19 +173,23 @@
+     my @libs = ('g2c', 'f2c');
+     my ($dir, $lib, $test);
+     foreach $test (@libs) {
+-      $dir = `g77 -print-file-name=lib$test.a`;
++      foreach $ext ('.so', '.a') {
++      $dir = `g77 -print-file-name=lib$test$ext`;
+       chomp $dir;
+       # Note that -print-file-name returns just the library name
+       # if it cant be found - make sure that we only accept the
+       # directory if it returns a proper path (or matches a /)
+-      if (defined $dir && $dir ne "lib$test.a") {
++      if (defined $dir && $dir ne "lib$test$ext") {
+         $lib = $test; # Found an existing library
+         last; 
+       }
++      }
++      last if (defined $lib);
+     }
+ 
+     if( defined $dir  && defined $lib) {
+-        $dir =~ s,/lib$lib.a$,,;
++        $dir =~ s,/lib$lib\..*$,,;
++	$dir = `cd $dir ; pwd`; # sanitize
+     } else {
+         $dir = "/usr/local/lib";
+         $lib = "f2c";
+@@ -194,7 +199,7 @@
+ };
+ $F77config{Generic}{G77}{Trail_} = 1;
+ $F77config{Generic}{G77}{Compiler} = find_in_path('g77','f77','fort77');
+-$F77config{Generic}{G77}{Cflags} = '-O';
++$F77config{Generic}{G77}{Cflags} = "$Config{'optimize'}";
+ $F77config{Generic}{DEFAULT} = 'G77';
+ $F77config{Generic}{F2c}     = $F77config{Generic}{G77};
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/perl-ExtUtils-F77-gcc.patch?r1=1.2&r2=1.3&f=u