Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci In directory vz-cvs-3.sog:/tmp/cvs-serv11307/10.4/stable/main/finkinfo/sci
Modified Files: nurbs-oct.info Log Message: Use gcc46 for omp instead of llvm. Sync to 10.4 tree. Index: nurbs-oct.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/nurbs-oct.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- nurbs-oct.info 23 Jan 2012 20:17:34 -0000 1.5 +++ nurbs-oct.info 20 Feb 2012 02:27:58 -0000 1.6 @@ -2,7 +2,7 @@ Package: nurbs-oct%type_pkg[oct] Version: 1.3.5 Type: oct (3.2.4 3.4.3 3.6.0), forge (nurbs) -Revision: 2 +Revision: 3 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net> # unfortunately, Homepage won't do types Homepage: http://octave.sourceforge.net/nurbs/index.html @@ -97,11 +97,13 @@ BuildDepends: << liboctave%type_pkg[oct]-dev, fftw3, + gcc46-compiler, hdf5.7, xcode ( >= 3.1-1) << Depends: << - octave%type_pkg[oct]-interpreter + octave%type_pkg[oct]-interpreter, + gcc46-shlibs << Conflicts: octave-forge @@ -109,7 +111,7 @@ DescPackaging: << This package: -Wants omp.h, which is included with gcc-4.2, but not gcc-4.0. +Wants omp.h. We'll use gcc46 to keep the package in sync with the 10.7 tree. Common for all octave-forge packages: @@ -124,6 +126,7 @@ #### Insert required changes here #### SourceDirectory: %type_pkg[forge] +PatchScript: perl -pi -e 's/mkoctfile/mkoctfile\-gcc4.6/g' src/Makefile ###################################### @@ -145,14 +148,6 @@ CompileScript: << #!/bin/sh -ev export OCTAVE=%p/bin/octave-%type_raw[oct] -osversion=`uname -r | cut -d. -f1` -if [ $osversion -eq 9 ] -# set compilers on 10.5; presumably not needed on octave-3.4.3, since -# we build with gcc-4.2 or llvm-gcc there. -then - export CC=gcc-4.2 - export CXX=gcc-4.2 -fi # repack tarball, since octave-3.4.3 appears not to want to install # from directories if [ %type_pkg[oct] -ge 343 ] ------------------------------------------------------------------------------ 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