Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv32654
Modified Files:
nan-oct.info octave-3.0.5-10.5.info octave-3.0.5.info
octave-3.2.4-10.5.info octave-3.2.4.info
Added Files:
nan-oct-10.5.info
Removed Files:
mkoctfile-gcc.info
Log Message:
Roll mkoctfile-gcc's functionality into main octave-dev package.
Update octave* and nan-oct's BuildDepends accordingly.
Fix x86_64 BLAS_LIBS for octave-3.2.4 non-atlas.
Index: octave-3.0.5-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave-3.0.5-10.5.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- octave-3.0.5-10.5.info 23 Sep 2011 14:40:51 -0000 1.1
+++ octave-3.0.5-10.5.info 30 Sep 2011 13:41:11 -0000 1.2
@@ -1,8 +1,8 @@
Info2: <<
Package: octave%type_pkg[-atlas]
-Type: -atlas (boolean), oct(3.0.5)
+Type: -atlas (boolean), oct(3.0.5), gcc (4.6)
Version: 3.0.5
-Revision: 125
+Revision: 126
Distribution: 10.5
Maintainer: Alexander Hansen <[email protected]>
@@ -12,7 +12,7 @@
BuildDepends: <<
glpk-dev, hdf5.7-oldapi, readline5, libncurses5, fftw3 (>= 3.1.1-7),
libcurl4,
pcre, gcc46-compiler, suitesparse-metis, metis, qhull6-dev, fink (>=
0.28), fink-package-precedence, sed,
- (%type_raw[-atlas] = atlas) atlas, flag-sort
+ (%type_raw[-atlas] = atlas) atlas, flag-sort, darwin ( >=9.2.0-1)
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev
@@ -54,9 +54,8 @@
-e "s|%%OCTAVE_CONF_SH_LD%%|\"`which g++`\"|"
src/oct-conf.h.in mkoctfile.in
# Add the BLAS C library for the -atlas variant.
if [ "%type_pkg[-atlas]" = "-atlas" ]
- then
- sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"%p/lib/liblapack.dylib %p/lib/libf77blas.dylib
%p/lib/libcblas.dylib"|' \
- src/oct-conf.h.in mkoctfile.in
+ then sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"%p/lib/liblapack.dylib %p/lib/libf77blas.dylib
%p/lib/libcblas.dylib"|' \
+ src/oct-conf.h.in
mkoctfile.in
fi
<<
@@ -77,14 +76,14 @@
export FFLAGS='-O3'
if [ "%type_pkg[-atlas]" == "" ]
then
-
a='--with-lapack=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib
--with-blas=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib'
+ a='--with-lapack=-Wl,-framework,Accelerate
--with-blas=-Wl,-framework,Accelerate'
export FFLAGS='-O3 -ff2c'
else
a='--with-lapack=%p/lib/liblapack.dylib
--with-blas=%p/lib/libf77blas.dylib'
export FFLAGS='-O3'
fi
FLIBDIR="%p/lib/gcc4.6/lib"
- ./configure AR="/usr/bin/ar" FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
+ ./configure FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
make
fink-package-precedence --depfile-ext='\.d$'
--prohibit-bdep=%{Ni},%{Ni}-atlas,%{Ni}%type_raw[oct]-dev,%{Ni}%type_raw[oct]-atlas-dev,%{Ni}305-dev,%{Ni}305-atlas-dev,saclib-gcc46,saclib
src
<<
@@ -127,6 +126,14 @@
# for the -atlas variant, add libcblas.dylib to BLAS_LIBS:
perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1
%p/lib/libcblas.dylib|' \
%i/bin/%{ni}-bug-%v
+ cp %i/bin/mkoctfile-%type_raw[oct]
%i/bin/mkoctfile-%type_raw[oct]-gcc%type_raw[gcc]
+ perl -p -e \
+ 's,(CC).*(gcc),\1\="%p/bin/\2-fsf-%type_raw[gcc],g; \
+ s,(CXX).*(g\+\+),\1="%p/bin/\2-fsf-%type_raw[gcc],g' \
+ %i/bin/mkoctfile-%type_raw[oct]-gcc%type_raw[gcc]
+ cd %i/bin
+ # create convenience symlink
+ ln -s mkoctfile-%type_raw[oct]-gcc%type_raw[gcc] mkoctfile-gcc%type_raw[gcc]
<<
InfoDocs: %{Ni}.info
RuntimeVars: <<
@@ -149,7 +156,7 @@
%{Ni} (<< 3.0.5-5), %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
- Depends: fftw3-shlibs, gcc46-shlibs, hdf5.7-oldapi-shlibs,
readline5-shlibs, (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
+ Depends: fftw3-shlibs, gcc%type_pkg[gcc]-shlibs, hdf5.7-oldapi-shlibs,
readline5-shlibs, (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
Files: <<
lib/%{Ni}-%v
<<
@@ -178,23 +185,26 @@
<<
SplitOff2: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]-dev
- Depends: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
gcc46-compiler, (%type_raw[-atlas] = atlas) atlas (>= 3.8.1-1)
+ Depends: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
gcc%type_pkg[gcc]-compiler, (%type_raw[-atlas] = atlas) atlas (>= 3.8.1-1)
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
(%type_raw[-atlas] = atlas) %{Ni} (<< 3.0.5-5),
(%type_raw[-atlas] != atlas) %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5),
- %{Ni}324-dev, %{Ni}324-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev
+ %{Ni}324-dev, %{Ni}324-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev,
+ mkoctfile%type_pkg[oct]-gcc46,
mkoctfile%type_pkg[oct]-gcc46-atlas
<<
Replaces: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
%{Ni} (<< 3.0.5-5), %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5),
- %{Ni}324-dev, %{Ni}324-dev, %{Ni}324-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev
+ %{Ni}324-dev, %{Ni}324-dev, %{Ni}324-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev,
+ mkoctfile%type_pkg[oct]-gcc46,
mkoctfile%type_pkg[oct]-gcc46-atlas
<<
BuildDependsOnly: true
+
Files: <<
include/%{Ni}-%v
bin/mkoctfile*
@@ -202,13 +212,10 @@
share/man/man1/mkoctfile.1
share/man/man1/octave-config.1
<<
+
DescDetail: <<
This package contains files needed to build against Octave, including
headers and the mkoctfile executable.
-
- Note: mkoctfile encodes the compiler wrappers that Fink uses.
- Use "fink reinstall %n" if you update your OS in-place
- and it will be updated for your new OS version.
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
@@ -221,6 +228,10 @@
on %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need
to BuildDepend on
hdf5-oldapi and fftw3.
<<
+ DescPackaging: <<
+ We Make up an extra mkoctfile which uses a Fink gcc for packages that
need
+ stuff which isn't included in Xcode.
+ <<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
<<
@@ -292,7 +303,7 @@
to initialize octave sessions to know about Fink's octave-versioned
install location for octave-forge packages. If you use the '--norc'
or '-f' flags in your Octave script, these packages won't be visible.
- You'll need torun the following command in your script:
+ You'll need to run the following command in your script:
pkg global_list %p/var/octave/%v/octave_packages
<<
@@ -316,11 +327,6 @@
customizable via user-defined functions written in Octave's own language,
or using dynamically loaded modules written in C++, C, Fortran,
or other languages.
-
-Note: mkoctfile encodes the compiler wrappers that Fink uses.
-Use "fink reinstall %{Ni}%v%type_pkg[atlas]" if you update your OS in-place
-and it will be updated for your new OS version.
-
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
@@ -360,7 +366,7 @@
DescPort: <<
Thanks to Per Persson for most (if not all) of the work on the macos X port.
-As of revision 25: the non-atlas variant is built with -ff2c in the FFLAGS,
+As of revision 125: the non-atlas variant is built with -ff2c in the FFLAGS,
because this appears to be necessary when using the Accelerate framework.
<<
DescPackaging: <<
@@ -388,10 +394,7 @@
of the octave scripts during their build process and edit them to use the
package's name.
-As of revision 25:
-
-Give the full path '/usr/bin/ar' to configure because at least one Octave Forge
-package can't cope with just 'ar'.
+As of revision 125:
Patch oct-conf.h, mkoctfile, and octave-bug not to put "flag-sort -r" in the
name of the compiler used, and to use the full path of Fink's compiler
wrappers.
@@ -401,6 +404,14 @@
/x86_64) users. Unfortunately, this requires a rebuild on OS upgrades, because
the information in oct-conf.h gets hardcoded into the Octave interpreter
executable, and some octave-forge packages get information from that.
+
+As of revision 126:
+
+Force a mininum minor version of Leopard so that we can get rid of the ugly
+construction previously used for setting the BLAS and LAPACK libraries.
+
+Now includes an additional mkoctfile which uses Fink's gcc46 compilers instead
+of Xcode's.
<<
Homepage: http://www.octave.org/
License: GPL
Index: octave-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- octave-3.2.4.info 23 Sep 2011 14:40:51 -0000 1.20
+++ octave-3.2.4.info 30 Sep 2011 13:41:11 -0000 1.21
@@ -1,8 +1,8 @@
Info2: <<
Package: octave%type_pkg[-atlas]
-Type: -atlas (boolean), oct(3.2.4)
+Type: -atlas (boolean), oct(3.2.4), gcc (4.6)
Version: 3.2.4
-Revision: 225
+Revision: 226
Distribution: 10.6
Maintainer: Alexander Hansen <[email protected]>
@@ -12,7 +12,7 @@
BuildDepends: <<
glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
libcurl4, libftgl2, qhull6-dev, flag-sort,
- pcre, gcc46-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
+ pcre, gcc%type_pkg[gcc]-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
graphicsmagick-dev, freetype219,
(%type_raw[-atlas] = -atlas) atlas,
(%type_raw[-atlas] = -atlas) qrupdate-atlas (>=1.1.1-5),
@@ -83,9 +83,11 @@
-e "s|%%OCTAVE_CONF_SH_LD%%|\"`which g++`\"|"
src/oct-conf.h.in mkoctfile.in
# Add the BLAS C library for the -atlas variant.
if [ "%type_pkg[-atlas]" = "-atlas" ]
- then
- sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"%p/lib/liblapack.dylib %p/lib/libf77blas.dylib
%p/lib/libcblas.dylib"|' \
- src/oct-conf.h.in mkoctfile.in
+ then sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"%p/lib/liblapack.dylib %p/lib/libf77blas.dylib
%p/lib/libcblas.dylib"|' \
+ src/oct-conf.h.in
mkoctfile.in
+ elif [ "%m" = "x86_64" ]
+ then sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"-Wl,-framework,Accelerate"|' \
+ src/oct-conf.h.in
mkoctfile.in
fi
<<
@@ -106,14 +108,14 @@
export FFLAGS='-O3'
if [ "%type_pkg[-atlas]" == "" ]
then
-
a='--with-lapack=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib
--with-blas=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib'
+ a='--with-lapack=-Wl,-framework,Accelerate
--with-blas=-Wl,-framework,Accelerate'
export FFLAGS='-O3 -ff2c'
else
a='--with-lapack=%p/lib/liblapack.dylib
--with-blas=%p/lib/libf77blas.dylib'
export FFLAGS='-O3'
fi
FLIBDIR="%p/lib/gcc4.6/lib"
- ./configure AR="/usr/bin/ar" FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
+ ./configure FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
make
fink-package-precedence --depfile-ext='\.d$'
--prohibit-bdep=%{Ni},%{Ni}-atlas,%{Ni}%type_raw[oct]-dev,%{Ni}%type_raw[oct]-atlas-dev,%{Ni}305-dev,%{Ni}305-atlas-dev,saclib-gcc46,saclib
src
<<
@@ -160,8 +162,22 @@
-e "s|flag-sort -r g++|`which g++`|g" \
%i/bin/%{Ni}-bug-%v
# for the -atlas variant, add libcblas.dylib to BLAS_LIBS:
- perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1
%p/lib/libcblas.dylib|' \
- %i/bin/%{ni}-bug-%v
+ if ["%type_pkg[-atlas]" = "-atlas"]
+ then perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1
%p/lib/libcblas.dylib|' \
+ %i/bin/%{ni}-bug-%v
+ # for x86_64 non-atlas, set it to find the Accelerate Framework.
+ elif ["%m" = "x86_64"]
+ then perl -pi -e 's|(BLAS_LIBS=).*|$1"-Wl,-framework,Accelerate"|' \
+ %i/bin/%{ni}-bug-%v
+ fi
+ cp %i/bin/mkoctfile-%type_raw[oct]
%i/bin/mkoctfile-%type_raw[oct]-gcc%type_raw[gcc]
+ perl -p -e \
+ 's,(CC).*(gcc),\1\="%p/bin/\2-fsf-%type_raw[gcc],g; \
+ s,(CXX).*(g\+\+),\1="%p/bin/\2-fsf-%type_raw[gcc],g' \
+ %i/bin/mkoctfile-%type_raw[oct]-gcc%type_raw[gcc]
+ cd %i/bin
+ # create convenience symlink
+ ln -s mkoctfile-%type_raw[oct]-gcc%type_raw[gcc] mkoctfile-gcc%type_raw[gcc]
<<
InfoDocs: %{Ni}.info
RuntimeVars: <<
@@ -185,7 +201,7 @@
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
Depends: <<
- fftw3-shlibs, gcc46-shlibs, hdf5.7-shlibs, readline5-shlibs,
+ fftw3-shlibs, gcc%type_pkg[gcc]-shlibs, hdf5.7-shlibs,
readline5-shlibs,
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1),
(%type_raw[-atlas] = -atlas) qrupdate-atlas-shlibs (>=
1.1.1-5),
(%type_raw[-atlas] != -atlas) qrupdate-shlibs (>= 1.1.1-5)
@@ -218,23 +234,26 @@
<<
SplitOff2: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]-dev
- Depends: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
gcc46-compiler, (%type_raw[-atlas] = atlas) atlas (>= 3.8.1-1)
+ Depends: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
gcc%type_pkg[gcc]-compiler, (%type_raw[-atlas] = atlas) atlas (>= 3.8.1-1)
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
(%type_raw[-atlas] = atlas) %{Ni} (<< 3.0.5-5),
(%type_raw[-atlas] != atlas) %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5),
- %{Ni}305-dev, %{Ni}305-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev
+ %{Ni}305-dev, %{Ni}305-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev,
+ mkoctfile%type_pkg[oct]-gcc46,
mkoctfile%type_pkg[oct]-gcc46-atlas
<<
Replaces: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
%{Ni} (<< 3.0.5-5), %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5),
- %{Ni}305-dev, %{Ni}305-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev
+ %{Ni}305-dev, %{Ni}305-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev,
+ mkoctfile%type_pkg[oct]-gcc46,
mkoctfile%type_pkg[oct]-gcc46-atlas
<<
BuildDependsOnly: true
+
Files: <<
include/%{Ni}-%v
bin/mkoctfile*
@@ -242,13 +261,10 @@
share/man/man1/mkoctfile.1
share/man/man1/octave-config.1
<<
+
DescDetail: <<
This package contains files needed to build against Octave, including
headers and the mkoctfile executable.
-
- Note: mkoctfile encodes the compiler wrappers that Fink uses.
- Use "fink reinstall %n" if you update your OS in-place
- and it will be updated for your new OS version.
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
@@ -261,6 +277,10 @@
on %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need
to BuildDepend on
hdf5-oldapi and fftw3.
<<
+ DescPackaging: <<
+ We Make up an extra mkoctfile which uses a Fink gcc for packages that
need
+ stuff which isn't included in Xcode.
+ <<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
<<
@@ -334,7 +354,7 @@
to initialize octave sessions to know about Fink's octave-versioned
install location for octave-forge packages. If you use the '--norc'
or '-f' flags in your Octave script, these packages won't be visible.
- You'll need torun the following command in your script:
+ You'll need to run the following command in your script:
pkg global_list %p/var/octave/%v/octave_packages
<<
@@ -358,11 +378,6 @@
customizable via user-defined functions written in Octave's own language,
or using dynamically loaded modules written in C++, C, Fortran,
or other languages.
-
-Note: mkoctfile encodes the compiler wrappers that Fink uses.
-Use "fink reinstall %{Ni}%v%type_pkg[atlas]" if you update your OS in-place
-and it will be updated for your new OS version.
-
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
@@ -403,6 +418,9 @@
Thanks to Per Persson for most (if not all) of the work on the macos X port.
Cleanups from David Fang to get the package to build using clang.
+
+As of revision 225: the non-atlas variant is built with -ff2c in the FFLAGS,
+because this appears to be necessary when using the Accelerate framework.
<<
DescPackaging: <<
Not sane (and now not even compilable) to use private code
@@ -410,12 +428,6 @@
even when glpk stops exporting its internals. See:
http://octave.1599824.n4.nabble.com/GLPK-interface-was-Re-Multithreaded-Atlas-td1654632.html
-Patch the graphicsmagick interface to use InitializeMagick before doing
anything:
-
-http://sourceforge.net/tracker/?func=detail&aid=3104518&group_id=73485&atid=537937
-
-This was not mandatory in prior versions of GraphicsMagick, but now it is.
-
Set the GNUTERM environment variable to AquaTerm because autodetection
of DISPLAY seems to cause options to be fed to our gnuplot that it doesn't
understand.
AquaTerm seems to be a sensible default, particularly since gnuplot-nox is
also a
@@ -440,12 +452,18 @@
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}.
+As of revision 225:
+
+The -atlas variant depends on -atlas variants (only) of qrupdate and arpack.
+The non-atlas variant depends on non-atlas variants (only) of these.
+
Patch __magick_read__.cc to do the right thing for current versions of
GraphicsMagick and actually initialize before doing stuff.
-Give the full path '/usr/bin/ar' to configure because at least one Octave Forge
-package can't cope with just 'ar'.
+http://sourceforge.net/tracker/?func=detail&aid=3104518&group_id=73485&atid=537937
+This was not mandatory in prior versions of GraphicsMagick, but now it is.
+
Patch oct-conf.h, mkoctfile, and octave-bug not to put "flag-sort -r" in the
name of the compiler used, and to use the full path of Fink's compiler
wrappers.
Also, we add the BLAS C library to BLAS_LIBS in the -atlas variant. This makes
@@ -454,6 +472,17 @@
/x86_64) users. Unfortunately, this requires a rebuild on OS upgrades, because
the information in oct-conf.h gets hardcoded into the Octave interpreter
executable, and some octave-forge packages get information from that.
+
+As of revision 226:
+
+Get rid of the ugly construction previously used for setting the BLAS and
+LAPACK libraries.
+
+Fix issue in which BLAS_LIBS wasn't getting properly encoded for the x86_64
+non-atlas variant.
+
+Now includes an additional mkoctfile which uses Fink's gcc46 compilers instead
+of Xcode's.
<<
Homepage: http://www.octave.org/
License: GPL
Index: octave-3.2.4-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave-3.2.4-10.5.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- octave-3.2.4-10.5.info 23 Sep 2011 14:40:51 -0000 1.1
+++ octave-3.2.4-10.5.info 30 Sep 2011 13:41:11 -0000 1.2
@@ -1,8 +1,8 @@
Info2: <<
Package: octave%type_pkg[-atlas]
-Type: -atlas (boolean), oct(3.2.4)
+Type: -atlas (boolean), oct(3.2.4), gcc (4.6)
Version: 3.2.4
-Revision: 125
+Revision: 126
Distribution: 10.5
Maintainer: Alexander Hansen <[email protected]>
@@ -12,13 +12,14 @@
BuildDepends: <<
glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
libcurl4, libftgl2, qhull6-dev, flag-sort,
- pcre, gcc46-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
+ pcre, gcc%type_pkg[gcc]-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
graphicsmagick-dev, freetype219,
(%type_raw[-atlas] = -atlas) atlas,
(%type_raw[-atlas] = -atlas) qrupdate-atlas (>=1.1.1-5),
(%type_raw[-atlas] != -atlas) qrupdate (>=1.1.1-5),
(%type_raw[-atlas] = -atlas) arpack-atlas (>= 96patched-6),
- (%type_raw[-atlas] != -atlas) arpack (>= 96patched-6)
+ (%type_raw[-atlas] != -atlas) arpack (>= 96patched-6),
+ darwin ( >=9.2.0-1)
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev,
imagemagick10-dev
@@ -83,9 +84,11 @@
-e "s|%%OCTAVE_CONF_SH_LD%%|\"`which g++`\"|"
src/oct-conf.h.in mkoctfile.in
# Add the BLAS C library for the -atlas variant.
if [ "%type_pkg[-atlas]" = "-atlas" ]
- then
- sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"%p/lib/liblapack.dylib %p/lib/libf77blas.dylib
%p/lib/libcblas.dylib"|' \
- src/oct-conf.h.in mkoctfile.in
+ then sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"%p/lib/liblapack.dylib %p/lib/libf77blas.dylib
%p/lib/libcblas.dylib"|' \
+ src/oct-conf.h.in
mkoctfile.in
+ elif [ "%m" = "x86_64" ]
+ then sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"-Wl,-framework,Accelerate"|' \
+ src/oct-conf.h.in
mkoctfile.in
fi
<<
@@ -106,14 +109,14 @@
export FFLAGS='-O3'
if [ "%type_pkg[-atlas]" == "" ]
then
-
a='--with-lapack=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib
--with-blas=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib'
+ a='--with-lapack=-Wl,-framework,Accelerate
--with-blas=-Wl,-framework,Accelerate'
export FFLAGS='-O3 -ff2c'
else
a='--with-lapack=%p/lib/liblapack.dylib
--with-blas=%p/lib/libf77blas.dylib'
export FFLAGS='-O3'
fi
FLIBDIR="%p/lib/gcc4.6/lib"
- ./configure AR="/usr/bin/ar" FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
+ ./configure FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
make
fink-package-precedence --depfile-ext='\.d$'
--prohibit-bdep=%{Ni},%{Ni}-atlas,%{Ni}%type_raw[oct]-dev,%{Ni}%type_raw[oct]-atlas-dev,%{Ni}305-dev,%{Ni}305-atlas-dev,saclib-gcc46,saclib
src
<<
@@ -160,8 +163,22 @@
-e "s|flag-sort -r g++|`which g++`|g" \
%i/bin/%{Ni}-bug-%v
# for the -atlas variant, add libcblas.dylib to BLAS_LIBS:
- perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1
%p/lib/libcblas.dylib|' \
- %i/bin/%{ni}-bug-%v
+ if ["%type_pkg[-atlas]" = "-atlas"]
+ then perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1
%p/lib/libcblas.dylib|' \
+ %i/bin/%{ni}-bug-%v
+ # for x86_64 non-atlas, set it to find the Accelerate Framework.
+ elif ["%m" = "x86_64"]
+ then perl -pi -e 's|(BLAS_LIBS=).*|$1"-Wl,-framework,Accelerate"|' \
+ %i/bin/%{ni}-bug-%v
+ fi
+ cp %i/bin/mkoctfile-%type_raw[oct]
%i/bin/mkoctfile-%type_raw[oct]-gcc%type_raw[gcc]
+ perl -p -e \
+ 's,(CC).*(gcc),\1\="%p/bin/\2-fsf-%type_raw[gcc],g; \
+ s,(CXX).*(g\+\+),\1="%p/bin/\2-fsf-%type_raw[gcc],g' \
+ %i/bin/mkoctfile-%type_raw[oct]-gcc%type_raw[gcc]
+ cd %i/bin
+ # create convenience symlink
+ ln -s mkoctfile-%type_raw[oct]-gcc%type_raw[gcc] mkoctfile-gcc%type_raw[gcc]
<<
InfoDocs: %{Ni}.info
RuntimeVars: <<
@@ -185,7 +202,7 @@
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
Depends: <<
- fftw3-shlibs, gcc46-shlibs, hdf5.7-shlibs, readline5-shlibs,
+ fftw3-shlibs, gcc%type_pkg[gcc]-shlibs, hdf5.7-shlibs,
readline5-shlibs,
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1),
(%type_raw[-atlas] = -atlas) qrupdate-atlas-shlibs (>=
1.1.1-5),
(%type_raw[-atlas] != -atlas) qrupdate-shlibs (>= 1.1.1-5)
@@ -218,23 +235,26 @@
<<
SplitOff2: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]-dev
- Depends: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
gcc46-compiler, (%type_raw[-atlas] = atlas) atlas (>= 3.8.1-1)
+ Depends: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
gcc%type_pkg[gcc]-compiler, (%type_raw[-atlas] = atlas) atlas (>= 3.8.1-1)
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
(%type_raw[-atlas] = atlas) %{Ni} (<< 3.0.5-5),
(%type_raw[-atlas] != atlas) %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5),
- %{Ni}305-dev, %{Ni}305-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev
+ %{Ni}305-dev, %{Ni}305-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev,
+ mkoctfile%type_pkg[oct]-gcc46,
mkoctfile%type_pkg[oct]-gcc46-atlas
<<
Replaces: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
%{Ni} (<< 3.0.5-5), %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5),
- %{Ni}305-dev, %{Ni}305-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev
+ %{Ni}305-dev, %{Ni}305-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev,
+ mkoctfile%type_pkg[oct]-gcc46,
mkoctfile%type_pkg[oct]-gcc46-atlas
<<
BuildDependsOnly: true
+
Files: <<
include/%{Ni}-%v
bin/mkoctfile*
@@ -242,13 +262,10 @@
share/man/man1/mkoctfile.1
share/man/man1/octave-config.1
<<
+
DescDetail: <<
This package contains files needed to build against Octave, including
headers and the mkoctfile executable.
-
- Note: mkoctfile encodes the compiler wrappers that Fink uses.
- Use "fink reinstall %n" if you update your OS in-place
- and it will be updated for your new OS version.
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
@@ -261,6 +278,10 @@
on %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need
to BuildDepend on
hdf5-oldapi and fftw3.
<<
+ DescPackaging: <<
+ We Make up an extra mkoctfile which uses a Fink gcc for packages that
need
+ stuff which isn't included in Xcode.
+ <<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
<<
@@ -334,7 +355,7 @@
to initialize octave sessions to know about Fink's octave-versioned
install location for octave-forge packages. If you use the '--norc'
or '-f' flags in your Octave script, these packages won't be visible.
- You'll need torun the following command in your script:
+ You'll need to run the following command in your script:
pkg global_list %p/var/octave/%v/octave_packages
<<
@@ -358,11 +379,6 @@
customizable via user-defined functions written in Octave's own language,
or using dynamically loaded modules written in C++, C, Fortran,
or other languages.
-
-Note: mkoctfile encodes the compiler wrappers that Fink uses.
-Use "fink reinstall %{Ni}%v%type_pkg[atlas]" if you update your OS in-place
-and it will be updated for your new OS version.
-
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
@@ -404,7 +420,7 @@
Cleanups from David Fang to get the package to build using clang.
-As of revision 25: the non-atlas variant is built with -ff2c in the FFLAGS,
+As of revision 125: the non-atlas variant is built with -ff2c in the FFLAGS,
because this appears to be necessary when using the Accelerate framework.
<<
DescPackaging: <<
@@ -413,12 +429,6 @@
even when glpk stops exporting its internals. See:
http://octave.1599824.n4.nabble.com/GLPK-interface-was-Re-Multithreaded-Atlas-td1654632.html
-Patch the graphicsmagick interface to use InitializeMagick before doing
anything:
-
-http://sourceforge.net/tracker/?func=detail&aid=3104518&group_id=73485&atid=537937
-
-This was not mandatory in prior versions of GraphicsMagick, but now it is.
-
Set the GNUTERM environment variable to AquaTerm because autodetection
of DISPLAY seems to cause options to be fed to our gnuplot that it doesn't
understand.
AquaTerm seems to be a sensible default, particularly since gnuplot-nox is
also a
@@ -443,7 +453,7 @@
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}.
-As of revision 25:
+As of revision 125:
The -atlas variant depends on -atlas variants (only) of qrupdate and arpack.
The non-atlas variant depends on non-atlas variants (only) of these.
@@ -451,9 +461,10 @@
Patch __magick_read__.cc to do the right thing for current versions of
GraphicsMagick and actually initialize before doing stuff.
-Give the full path '/usr/bin/ar' to configure because at least one Octave Forge
-package can't cope with just 'ar'.
+http://sourceforge.net/tracker/?func=detail&aid=3104518&group_id=73485&atid=537937
+This was not mandatory in prior versions of GraphicsMagick, but now it is.
+
Patch oct-conf.h, mkoctfile, and octave-bug not to put "flag-sort -r" in the
name of the compiler used, and to use the full path of Fink's compiler
wrappers.
Also, we add the BLAS C library to BLAS_LIBS in the -atlas variant. This makes
@@ -462,6 +473,17 @@
/x86_64) users. Unfortunately, this requires a rebuild on OS upgrades, because
the information in oct-conf.h gets hardcoded into the Octave interpreter
executable, and some octave-forge packages get information from that.
+
+As of revision 126:
+
+Force a mininum minor version of Leopard so that we can get rid of the ugly
+construction previously used for setting the BLAS and LAPACK libraries.
+
+Fix issue in which BLAS_LIBS wasn't getting properly encoded for the x86_64
+non-atlas variant.
+
+Now includes an additional mkoctfile which uses Fink's gcc46 compilers instead
+of Xcode's.
<<
Homepage: http://www.octave.org/
License: GPL
Index: octave-3.0.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave-3.0.5.info,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- octave-3.0.5.info 23 Sep 2011 14:40:51 -0000 1.21
+++ octave-3.0.5.info 30 Sep 2011 13:41:11 -0000 1.22
@@ -1,8 +1,8 @@
Info2: <<
Package: octave%type_pkg[-atlas]
-Type: -atlas (boolean), oct(3.0.5)
+Type: -atlas (boolean), oct(3.0.5), gcc (4.6)
Version: 3.0.5
-Revision: 225
+Revision: 226
Distribution: 10.6
Maintainer: Alexander Hansen <[email protected]>
@@ -54,9 +54,8 @@
-e "s|%%OCTAVE_CONF_SH_LD%%|\"`which g++`\"|"
src/oct-conf.h.in mkoctfile.in
# Add the BLAS C library for the -atlas variant.
if [ "%type_pkg[-atlas]" = "-atlas" ]
- then
- sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"%p/lib/liblapack.dylib %p/lib/libf77blas.dylib
%p/lib/libcblas.dylib"|' \
- src/oct-conf.h.in mkoctfile.in
+ then sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"%p/lib/liblapack.dylib %p/lib/libf77blas.dylib
%p/lib/libcblas.dylib"|' \
+ src/oct-conf.h.in
mkoctfile.in
fi
<<
@@ -77,14 +76,14 @@
export FFLAGS='-O3'
if [ "%type_pkg[-atlas]" == "" ]
then
-
a='--with-lapack=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib
--with-blas=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib'
+ a='--with-lapack=-Wl,-framework,Accelerate
--with-blas=-Wl,-framework,Accelerate'
export FFLAGS='-O3 -ff2c'
else
a='--with-lapack=%p/lib/liblapack.dylib
--with-blas=%p/lib/libf77blas.dylib'
export FFLAGS='-O3'
fi
FLIBDIR="%p/lib/gcc4.6/lib"
- ./configure AR="/usr/bin/ar" FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
+ ./configure FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
make
fink-package-precedence --depfile-ext='\.d$'
--prohibit-bdep=%{Ni},%{Ni}-atlas,%{Ni}%type_raw[oct]-dev,%{Ni}%type_raw[oct]-atlas-dev,%{Ni}305-dev,%{Ni}305-atlas-dev,saclib-gcc46,saclib
src
<<
@@ -127,6 +126,14 @@
# for the -atlas variant, add libcblas.dylib to BLAS_LIBS:
perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1
%p/lib/libcblas.dylib|' \
%i/bin/%{ni}-bug-%v
+ cp %i/bin/mkoctfile-%type_raw[oct]
%i/bin/mkoctfile-%type_raw[oct]-gcc%type_raw[gcc]
+ perl -p -e \
+ 's,(CC).*(gcc),\1\="%p/bin/\2-fsf-%type_raw[gcc],g; \
+ s,(CXX).*(g\+\+),\1="%p/bin/\2-fsf-%type_raw[gcc],g' \
+ %i/bin/mkoctfile-%type_raw[oct]-gcc%type_raw[gcc]
+ cd %i/bin
+ # create convenience symlink
+ ln -s mkoctfile-%type_raw[oct]-gcc%type_raw[gcc] mkoctfile-gcc%type_raw[gcc]
<<
InfoDocs: %{Ni}.info
RuntimeVars: <<
@@ -149,7 +156,7 @@
%{Ni} (<< 3.0.5-5), %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
- Depends: fftw3-shlibs, gcc46-shlibs, hdf5.7-oldapi-shlibs,
readline5-shlibs, (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
+ Depends: fftw3-shlibs, gcc%type_pkg[gcc]-shlibs, hdf5.7-oldapi-shlibs,
readline5-shlibs, (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
Files: <<
lib/%{Ni}-%v
<<
@@ -178,23 +185,26 @@
<<
SplitOff2: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]-dev
- Depends: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
gcc46-compiler, (%type_raw[-atlas] = atlas) atlas (>= 3.8.1-1)
+ Depends: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
gcc%type_pkg[gcc]-compiler, (%type_raw[-atlas] = atlas) atlas (>= 3.8.1-1)
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
(%type_raw[-atlas] = atlas) %{Ni} (<< 3.0.5-5),
(%type_raw[-atlas] != atlas) %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5),
- %{Ni}324-dev, %{Ni}324-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev
+ %{Ni}324-dev, %{Ni}324-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev,
+ mkoctfile%type_pkg[oct]-gcc46,
mkoctfile%type_pkg[oct]-gcc46-atlas
<<
Replaces: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
%{Ni} (<< 3.0.5-5), %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5),
- %{Ni}324-dev, %{Ni}324-dev, %{Ni}324-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev
+ %{Ni}324-dev, %{Ni}324-dev, %{Ni}324-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev,
+ mkoctfile%type_pkg[oct]-gcc46,
mkoctfile%type_pkg[oct]-gcc46-atlas
<<
BuildDependsOnly: true
+
Files: <<
include/%{Ni}-%v
bin/mkoctfile*
@@ -202,13 +212,10 @@
share/man/man1/mkoctfile.1
share/man/man1/octave-config.1
<<
+
DescDetail: <<
This package contains files needed to build against Octave, including
headers and the mkoctfile executable.
-
- Note: mkoctfile encodes the compiler wrappers that Fink uses.
- Use "fink reinstall %n" if you update your OS in-place
- and it will be updated for your new OS version.
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
@@ -221,6 +228,10 @@
on %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need
to BuildDepend on
hdf5-oldapi and fftw3.
<<
+ DescPackaging: <<
+ We Make up an extra mkoctfile which uses a Fink gcc for packages that
need
+ stuff which isn't included in Xcode.
+ <<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
<<
@@ -292,7 +303,7 @@
to initialize octave sessions to know about Fink's octave-versioned
install location for octave-forge packages. If you use the '--norc'
or '-f' flags in your Octave script, these packages won't be visible.
- You'll need torun the following command in your script:
+ You'll need to run the following command in your script:
pkg global_list %p/var/octave/%v/octave_packages
<<
@@ -316,11 +327,6 @@
customizable via user-defined functions written in Octave's own language,
or using dynamically loaded modules written in C++, C, Fortran,
or other languages.
-
-Note: mkoctfile encodes the compiler wrappers that Fink uses.
-Use "fink reinstall %{Ni}%v%type_pkg[atlas]" if you update your OS in-place
-and it will be updated for your new OS version.
-
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
@@ -360,7 +366,7 @@
DescPort: <<
Thanks to Per Persson for most (if not all) of the work on the macos X port.
-As of revision 25: the non-atlas variant is built with -ff2c in the FFLAGS,
+As of revision 225: the non-atlas variant is built with -ff2c in the FFLAGS,
because this appears to be necessary when using the Accelerate framework.
<<
DescPackaging: <<
@@ -388,10 +394,7 @@
of the octave scripts during their build process and edit them to use the
package's name.
-As of revision 25:
-
-Give the full path '/usr/bin/ar' to configure because at least one Octave Forge
-package can't cope with just 'ar'.
+As of revision 225:
Patch oct-conf.h, mkoctfile, and octave-bug not to put "flag-sort -r" in the
name of the compiler used, and to use the full path of Fink's compiler
wrappers.
@@ -401,6 +404,14 @@
/x86_64) users. Unfortunately, this requires a rebuild on OS upgrades, because
the information in oct-conf.h gets hardcoded into the Octave interpreter
executable, and some octave-forge packages get information from that.
+
+As of revision 226:
+
+Get rid of the ugly construction previously used for setting the BLAS and
+LAPACK libraries.
+
+Now includes an additional mkoctfile which uses Fink's gcc46 compilers instead
+of Xcode's.
<<
Homepage: http://www.octave.org/
License: GPL
--- mkoctfile-gcc.info DELETED ---
Index: nan-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/nan-oct.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nan-oct.info 25 Sep 2011 00:58:58 -0000 1.4
+++ nan-oct.info 30 Sep 2011 13:41:11 -0000 1.5
@@ -83,8 +83,7 @@
# not use the conditional, of course.
BuildDepends: <<
- octave%type_pkg[oct]%type_pkg[-atlas]-dev,
- mkoctfile%type_pkg[oct]-gcc46%type_pkg[-atlas] (>= 1.0.3-2),
+ octave%type_pkg[oct]%type_pkg[-atlas]-dev (>= 3.2.4-226),
( type_raw[-atlas] = -atlas ) atlas,
fftw3,
gcc46-compiler,
@@ -113,6 +112,8 @@
#### Insert required changes here ####
+Distribution: 10.6
+
TarFilesRename: NaN:nan-2.4.4
PatchFile: %{Ni}.patch
@@ -131,7 +132,7 @@
Wants libgomp, which isn't available from the OS X compliers, so we use
gcc46-compiler.
src/Makefile: patch in the locations of the gcc46-compiler executables and
the
- gcc46-enabled mkoctfile executable; also set
LIBS.
+ gcc46-enabled mkoctfile executable from
octaveN-dev; also set LIBS.
src/xptopen.cpp: OS X defines __DARWIN_BYTE_ORDER, __DARWIN_BIG_ENDIAN,
and
__DARWIN_LITTLE_ENDIAN rather than just
__BYTE_ORDER,
@@ -183,8 +184,7 @@
This package:
Rename nanconv2.m to conv2nan.m to match the function name
-Point the -atlas variant to a BLAS library from atlas.
-
+Point the -atlas variant to the BLAS library from atlas.
Common for all octave-forge packages:
--- NEW FILE: nan-oct-10.5.info ---
Info2: <<
Package: nan%type_pkg[-atlas]-oct%type_pkg[oct]
Version: 2.4.4
Type: oct (3.0.5 3.2.4), forge (nan), -atlas (boolean)
Revision: 3
Maintainer: Alexander Hansen <[email protected]>
# unfortunately, Homepage won't do types
Homepage: http://octave.sourceforge.net/nan/index.html
Description: Missing value statistical toolbox for Octave
DescDetail: <<
A statistics and machine learning toolbox for Octave for data with and without
missing values.
This package provides the following additional functions:
coefficient_of_variation
geomean
meansq
skewness
covm
cor
cov
corrcoef
harmmean
median
statistic
detrend
kurtosis
moment
std
mad
naninsttest
nantest
nansum
nanstd
normpdf
normcdf
norminv
meandev
percentile
quantile
rankcorr
ranks
rms
sumskipnan
var
mean
sem
spearman
trimean
tpdf
tcdf
tinv
zscore
conv2nan
flag_implicit_significance
xcovf
train_sc
test_sc
xval
classify
train_lda_sparse
decovm
gscatter
mahal
cdfplot
hist2res
fss
cat2bin
ttest
ttest2
xptopen
bland_altmann
cumsumskipnan
<<
License: GPL
# All octave-forge packages have to have the following BuildDepends:
# octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
# fftw3,
# ( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
# ( %type_pkg[oct] != 305 ) hdf5.7
#
# Packages which serve only Octave-3.0.5 or only Octave > 3.0.5 need
# not use the conditional, of course.
BuildDepends: <<
octave%type_pkg[oct]%type_pkg[-atlas]-dev (>= 3.2.4-126),
( type_raw[-atlas] = -atlas ) atlas,
fftw3,
gcc46-compiler,
fink (>= 0.24.12),
( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
( %type_pkg[oct] != 305 ) hdf5.7
<<
Depends: <<
octave%type_pkg[oct]%type_pkg[-atlas],
( type_raw[-atlas] = -atlas ) atlas-shlibs,
gcc46-shlibs
<<
Conflicts: <<
octave-forge,
octave-forge-%type_raw[forge] (<< 1.0.7-999),
nan-oct%type_pkg[oct],
nan-atlas-oct%type_pkg[oct]
<<
Replaces: <<
octave-forge-%type_raw[forge] (<< 1.0.7-999),
nan-oct%type_pkg[oct],
nan-atlas-oct%type_pkg[oct]
<<
Source-MD5: 2c55a3a453b62e1858328d2a681ba8b2
#### Insert required changes here ####
Distribution: 10.5
TarFilesRename: NaN:nan-2.4.4
PatchFile: %{Ni}.patch
PatchFile-MD5: 84e7acaed36e549474c9a66ee110bab8
PatchScript: <<
#!/bin/sh -ev
sed -e 's|@FINKPREFIX@|%p|g' -e 's|@OCTVERSION@|%type_raw[oct]|'
%{PatchFile} | patch -p1
if [ "%type_raw[-atlas]" = "-atlas" ]
then sed -i.bak -e 's|\-lblas|-L%p/lib -lcblas|g' src/Makefile
fi
<<
SetLIBS: -L%p/lib/gcc4.6/lib/
DescPort: <<
Wants libgomp, which isn't available from the OS X compliers, so we use
gcc46-compiler.
src/Makefile: patch in the locations of the gcc46-compiler executables and
the
gcc46-enabled mkoctfile executable from
octaveN-dev; also set LIBS.
src/xptopen.cpp: OS X defines __DARWIN_BYTE_ORDER, __DARWIN_BIG_ENDIAN,
and
__DARWIN_LITTLE_ENDIAN rather than just
__BYTE_ORDER,
__BIG_ENDIAN, and __LITTLE_ENDIAN,
respectively, so we
#define the latter as their __DARWIN_
counterparts.
<<
######################################
# Do not change anything from this point down, unless absolutely necessary,
# since the foo-oct%type_pkg[oct] packages are designed to be built/installed
# in the same way.
Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
SetMAKEFLAGS: -j1
CompileScript: <<
mv inst/nanconv2.m inst/conv2nan.m
%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
<<
InstallScript: <<
#!/bin/sh -ev
%p/share/octave/%type_raw[oct]/scripts/octave-forge-install.sh
%type_raw[forge]-%v %i %b
mkdir -p %i/share/octave/%type_raw[oct]/%type_raw[forge]-%v
# copy template scripts
cp %p/share/octave/%type_raw[oct]/scripts/octave-forge-prerm
%p/share/octave/%type_raw[oct]/scripts/octave-forge-postinst
%i/share/octave/%type_raw[oct]/%type_raw[forge]-%v
cd %i/share/octave/%type_raw[oct]/%type_raw[forge]-%v
sed -i -e 's/@PKGNAME@/%type_raw[forge]-%v/' octave-forge-postinst
sed -i -e 's/@PKGNAME@/%type_raw[forge]/' octave-forge-prerm
chmod a+x octave-forge*
<<
PostInstScript: <<
if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f
%p/var/octave/%type_raw[oct]/octave_packages ]
then
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
else
mv
%p/share/octave/%type_raw[oct]/packages/%type_raw[forge]-%v/octave_packages
%p/var/octave/%type_raw[oct]/octave_packages
fi
<<
PreRmScript:
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
DescPackaging: <<
This package:
Rename nanconv2.m to conv2nan.m to match the function name
Point the -atlas variant to the BLAS library from atlas.
Common for all octave-forge packages:
We read in postinst and prerm template scripts installed by octaveN and modify
them to use the name of this package because Octave's package manager can't
cope with non-literal arguments.
The Type: forge (pkgname) is used to minimize what needs to be changed when
using this .info file as a template.
<<
<<
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
