Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv5684/10.7/stable/main/finkinfo/sci

Modified Files:
        octave-3.0.5.info octave-3.2.4.info octave-3.4.3.info 
Log Message:
More compiler wrapper fixes.
I _so_ want to drop support for OS X < 10.7.

Index: octave-3.0.5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.0.5.info,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- octave-3.0.5.info   19 Jan 2012 20:14:48 -0000      1.32
+++ octave-3.0.5.info   23 Jan 2012 15:44:01 -0000      1.33
@@ -2,7 +2,7 @@
 Package: octave%type_pkg[-atlas]
 Type: -atlas (boolean), oct(3.0.5), gcc (4.6)
 Version: 3.0.5
-Revision: 3005
+Revision: 3006
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 
 Source: mirror:gnu:%{Ni}/%{Ni}-%v.tar.bz2
@@ -296,7 +296,8 @@
                                else
                                        # default cc compilers on powerpc and 
i386 builds with proper arch.
                                        ln -s /usr/bin/gcc oct-cc
-                                       perl -p -e 
's,COMPILER,%p/var/lib/fink/path-prefix-g++-4.0/c++' oct-cxx 
+                                       perl -p -e 
's,COMPILER,%p/var/lib/fink/path-prefix-g++-4.0/c++' \
+                                                               
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cxx 
                                fi ;;
                        # fangism--feel free to update this
                        *)  printf "You will need to generate your own 
%p/bin/oct-cc and %p/bin/oct-cxx symlinks.\n" ;;

Index: octave-3.2.4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- octave-3.2.4.info   19 Jan 2012 20:14:48 -0000      1.36
+++ octave-3.2.4.info   23 Jan 2012 15:44:01 -0000      1.37
@@ -2,7 +2,7 @@
 Package: octave%type_pkg[-atlas]%type_pkg[-x11]
 Type: -atlas (boolean), oct(3.2.4), gcc (4.6), -x11 (boolean)
 Version: 3.2.4
-Revision: 3006
+Revision: 3007
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 
 BuildDepends: <<
@@ -416,7 +416,8 @@
                                else
                                        # default cc compilers on powerpc and 
i386 builds with proper arch.
                                        ln -s /usr/bin/gcc oct-cc
-                                       perl -p -e 
's,COMPILER,%p/var/lib/fink/path-prefix-g++-4.0/c++' oct-cxx 
+                                       perl -p -e 
's,COMPILER,%p/var/lib/fink/path-prefix-g++-4.0/c++' \
+                                                               
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cxx 
                                fi ;;
                        # fangism--feel free to update this
                        *)  printf "You will need to generate your own 
%p/bin/oct-cc and %p/bin/oct-cxx symlinks.\n" ;;

Index: octave-3.4.3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.4.3.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- octave-3.4.3.info   23 Jan 2012 15:27:48 -0000      1.14
+++ octave-3.4.3.info   23 Jan 2012 15:44:01 -0000      1.15
@@ -2,7 +2,7 @@
 Package: octave%type_pkg[-atlas]%type_pkg[-x11]
 Type: -atlas (boolean), oct(3.4.3), gcc (4.6), -x11 (boolean)
 Version: 3.4.3
-Revision: 309
+Revision: 310
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 
 BuildDepends: <<
@@ -406,10 +406,9 @@
                                                                
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cxx
                                        chmod a+x oct-cc oct-cxx
                                else
-                                       # default cc compilers on powerpc and 
i386 builds with proper arch.
-                                       ln -s /usr/bin/gcc oct-cc
-                                       perl -p -e 
's,COMPILER,%p/var/lib/fink/path-prefix-g++-4.0/c++' \
-                                                               
%p/share/%{Ni}/%v/scripts/oct-compiler.in > %p/bin/oct-cxx
+                                       # Compilers on powerpc and i386 build 
with proper arch.
+                                       ln -s /usr/bin/gcc-4.2 oct-cc
+                                       ln -s /usr/bin/g++-4.2 oct-cxx 
                                fi ;;
                        # fangism--feel free to update this
                        *)  printf "You will need to generate your own 
%p/bin/oct-cc and %p/bin/oct-cxx symlinks.\n" ;;


------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to