Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/languages
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7436/10.4-transitional/stable/main/finkinfo/languages
Modified Files:
fort77.info fort77.patch
Log Message:
Avoid fork bomb
Index: fort77.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/languages/fort77.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fort77.patch 27 Apr 2005 03:40:33 -0000 1.1
+++ fort77.patch 20 Jun 2005 17:21:41 -0000 1.2
@@ -1,7 +1,19 @@
-diff -ru fort77-1.18/fort77 fort77-1.18-patched/fort77
---- fort77-1.18/fort77 Mon Apr 19 08:19:36 1999
-+++ fort77-1.18-patched/fort77 Fri Oct 3 21:42:38 2003
-@@ -191,7 +191,8 @@
+diff -ur fort77-1.18.old/fort77 fort77-1.18/fort77
+--- fort77-1.18.old/fort77 1999-04-19 05:19:36.000000000 -0700
++++ fort77-1.18/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;
@@ -11,7 +23,41 @@
push(@fopts,@includes,"-I.");
push(@fopts, @pfiles);
-@@ -253,7 +254,7 @@
+@@ -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;
+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...
Index: fort77.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/languages/fort77.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fort77.info 27 Apr 2005 03:40:33 -0000 1.1
+++ fort77.info 20 Jun 2005 17:21:41 -0000 1.2
@@ -1,6 +1,6 @@
Package: fort77
Version: 1.18
-Revision: 16
+Revision: 17
Description: Perl script to invoke f2c Fortran translator
DescDetail: <<
Can be used to compile Fortran, C and assembler code,
-------------------------------------------------------
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
