Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5201/10.4-transitional/stable/main/finkinfo/languages
Modified Files: fort77.patch Log Message: Fix error in patch Index: fort77.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/languages/fort77.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- fort77.patch 20 Jun 2005 17:21:41 -0000 1.2 +++ fort77.patch 20 Jun 2005 18:21:38 -0000 1.3 @@ -32,37 +32,3 @@ join(' ',@cppopts) . " | f2c " . join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile "; print STDERR "$0: Running \"$pipe\"" if $verbose; -diff -ur fort77-1.18.old/tests/fort77 fort77-1.18/tests/fort77 ---- fort77-1.18.old/tests/fort77 1999-04-19 05:19:36.000000000 -0700 -+++ fort77-1.18/tests/fort77 2005-06-20 10:18:58.000000000 -0700 -@@ -15,6 +15,11 @@ - $debug = 0; - $cc = $ENV{'CC'} || 'cc'; - -+# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77" -+# when invoking the Fortran compiler. We need to override this to -+# avoid getting stuck in a loop. -+$cc = "cc" if $cc =~ /fort77$/; -+ - # Loop over all options; pull all options from @ARGV and put all - # arguments into @argv. This is needed because, apparently, UNIX - # compilers acceppt options anywhere on the command line. -@@ -191,7 +196,8 @@ - - push(@fopts,$nnflag); - push(@copts,'-ffast-math') if $optimize && $fast_math; --push(@cppopts,@includes); -+push(@cppopts,@includes,"-I<PREFIX>/include"); -+push(@lopts,"-L<PREFIX>/lib"); - push(@fopts,@includes,"-I."); - push(@fopts, @pfiles); - -@@ -253,7 +259,7 @@ - - if ($cpp || ($ffile =~ /\.F$/)) { - # Backslashes at the end of comment lines confuse cpp... -- $pipe = "| /lib/cpp -traditional " . -+ $pipe = '| /usr/bin/cpp | grep -v "#pragma" ' . - join(' ',@cppopts) . " | f2c " . - join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile "; - print STDERR "$0: Running \"$pipe\"" if $verbose; ------------------------------------------------------- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits