Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci In directory vz-cvs-3.sog:/tmp/cvs-serv1688/sci
Modified Files: octave-3.2.4.info Log Message: sync w/ 10.!4, validated on powerpc-darwin8 Index: octave-3.2.4.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/octave-3.2.4.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- octave-3.2.4.info 7 Sep 2011 04:10:56 -0000 1.1 +++ octave-3.2.4.info 7 Sep 2011 18:42:47 -0000 1.2 @@ -2,7 +2,7 @@ Package: octave%type_pkg[-atlas] Type: -atlas (boolean), oct(3.2.4) Version: 3.2.4 -Revision: 10 +Revision: 11 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net> # disable atlas on 10.7 distro file until atlas is available @@ -147,6 +147,9 @@ # install the octave-forge helper scripts cp %{Ni}-forge* %i/share/%{Ni}/%v/scripts chmod a+x %i/share/%{Ni}/%v/scripts/* + # oct-conf.h needs to use Fink's compiler wrappers, too + sed -i.bak -e 's|flag-sort -r gcc|@WHICH_CC@|g' \ + -e 's|flag-sort -r g++|@WHICH_CXX@|g' %i/include/%{Ni}-%v/%{Ni}/oct-conf.h << InfoDocs: %{Ni}.info RuntimeVars: << @@ -232,7 +235,8 @@ fink_cc=`export $finkpath; which gcc` fink_cxx=`export $finkpath; which g++` sed -i.bak -e "s|@WHICH_CC@|$fink_cc|g" \ - -e "s|@WHICH_CXX@|$fink_cxx|g" %p/bin/mkoctfile-%type_raw[oct] + -e "s|@WHICH_CXX@|$fink_cxx|g" \ + %p/bin/mkoctfile-%type_raw[oct] %p/include/%{Ni}-%v/%{Ni}/oct-conf.h << DescDetail: << This package contains files needed to build against Octave, including @@ -426,6 +430,16 @@ We don't build the FLTK backend since we are allowing for Aqua and X11 variants of that bundle in the fltk-backend-{aqua|x11}. + +Patch mkoctfile-%v to use fink's compiler wrappers. This is done via a two-stage patch +in the PatchScript and then in the PostInstScript of octave%type_pkg[oct]-dev to allow for +OS upgrades. + +Octave encodes the name of the compilers used to build it in oct-conf.h, and unfortunately +that includes "flag-sort gcc -r" and "flag-sort g++ -r". To avoid forcing users to have +flag-sort, and so that it isn't required in our own Octave Forge package builds, we apply +a two-stage patch in the InstallScript and the PostInstScript of octave%type_pkg[oct]-dev +to use fink's compiler wrappers. << Homepage: http://www.octave.org/ License: GPL ------------------------------------------------------------------------------ Using storage to extend the benefits of virtualization and iSCSI Virtualization increases hardware utilization and delivers a new level of agility. Learn what those decisions are and how to modernize your storage and backup environments for virtualization. http://www.accelacomm.com/jaw/sfnl/114/51434361/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs