Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv3235/10.7/stable/main/finkinfo/sci
Modified Files:
nan-oct.info octave-3.0.5.info octave-3.2.4.info
Removed Files:
mkoctfile-gcc.info
Log Message:
Forward-port from 10.4
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.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- octave-3.0.5.info 23 Sep 2011 15:55:06 -0000 1.21
+++ octave-3.0.5.info 30 Sep 2011 14:00:09 -0000 1.22
@@ -1,8 +1,8 @@
Info2: <<
Package: octave%type_pkg[-atlas]
-Type: -atlas (.), oct(3.0.5)
+Type: -atlas (boolean), oct(3.0.5), gcc (4.6)
Version: 3.0.5
-Revision: 325
+Revision: 326
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
@@ -55,9 +55,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
<<
@@ -78,14 +77,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
<<
@@ -128,6 +127,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: <<
@@ -150,7 +157,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
<<
@@ -179,23 +186,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*
@@ -203,13 +213,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
@@ -222,6 +229,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
<<
@@ -293,7 +304,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
<<
@@ -317,11 +328,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
@@ -361,7 +367,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 325: the non-atlas variant is built with -ff2c in the FFLAGS,
because this appears to be necessary when using the Accelerate framework.
<<
DescPackaging: <<
@@ -389,10 +395,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 325:
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.
@@ -402,6 +405,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 326:
+
+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: nan-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/nan-oct.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- nan-oct.info 25 Sep 2011 00:58:58 -0000 1.5
+++ nan-oct.info 30 Sep 2011 14:00:09 -0000 1.6
@@ -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-326),
( type_raw[-atlas] = -atlas ) atlas,
fftw3,
gcc46-compiler,
@@ -131,7 +130,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 +182,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:
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.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- octave-3.2.4.info 23 Sep 2011 15:55:06 -0000 1.21
+++ octave-3.2.4.info 30 Sep 2011 14:00:09 -0000 1.22
@@ -1,8 +1,8 @@
Info2: <<
Package: octave%type_pkg[-atlas]
-Type: -atlas (.), oct(3.2.4)
+Type: -atlas (.), oct(3.2.4), gcc (4.6)
Version: 3.2.4
-Revision: 325
+Revision: 326
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
@@ -13,7 +13,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),
@@ -87,9 +87,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
<<
@@ -110,21 +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
- # put compiler information into our own version of Makeconf, which in turn
- # goes into oct-conf.h, which in turn gets harcoded into the Octave
- # interpreter's 'octave_config_info' function, which is used by some of the
- # octave-forge packages.
- sed -e 's|flag-sort -r gcc|@WHICH_CC@|g' \
- -e 's|flag-sort -r g++|@WHICH_CXX@|g' \
- Makeconf > Makeconf.fink
+ ./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
<<
@@ -145,15 +137,15 @@
#!/bin/sh -ev
export MAKEFLAGS=-j1
make install DESTDIR=%d
- # install Fink-specific octaverc which points at our oct-versioned
- # package directory
+ # Install Fink-specific octaverc which points at our oct-versioned
+ # package directory.
cp %b/%{Ni}rc %i/share/%{Ni}/%v/m/startup
mkdir -p %i/var/%{Ni}/%v/
# install examples
mkdir -p %i/share/%{Ni}/%v/doc/examples
cp -R examples %i/share/%{Ni}/%v/doc/examples
pushd %i/bin
- # clear out hardcoded Fink sed
+ # clear out hardcoded Fink sed.
for file in mkoctfile-%v %{Ni}-bug-%v %{Ni}-config-%v
do
perl -pi -e 's|%p/bin/sed|/usr/bin/sed|g' $file
@@ -165,13 +157,25 @@
# install the octave-forge helper scripts
cp %{Ni}-forge* %i/share/%{Ni}/%v/scripts
chmod a+x %i/share/%{Ni}/%v/scripts/*
- # octave-bug 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/bin/%{Ni}-bug-%v
+ # octave-bug needs to use Fink's compiler wrappers, too, since
+ # some octave-forge packages use it for configuration.
+ sed -i.bak -e "s|flag-sort -r gcc|`which gcc`|g" \
+ -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/mkoctfile-%v %i/include/%{ni}-%v/%{ni}/oct-conf.h %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.
+ 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: <<
@@ -195,7 +199,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)
@@ -228,23 +232,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*
@@ -252,22 +259,10 @@
share/man/man1/mkoctfile.1
share/man/man1/octave-config.1
<<
- PostInstScript: <<
- finkpath=`fink dumpinfo -ePATH %N`
- 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] \
- %p/include/%{Ni}-%v/%{Ni}/oct-conf.h
- <<
+
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
@@ -280,6 +275,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
<<
@@ -315,14 +314,6 @@
bin/%{Ni}-bug-%v
var/%{Ni}/%v
<<
- PostInstScript: <<
- finkpath=`fink dumpinfo -ePATH %N`
- 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/%{Ni}-bug-%v
- <<
DescDetail: <<
The %{Ni}%type_pkg[oct]%type_pkg[-atlas] package contains versioned
executables, as well as all of the
core functionality of the Octave interpreter. Note that the GNU info
file,
@@ -361,7 +352,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
<<
@@ -385,11 +376,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
@@ -434,6 +420,9 @@
CGDisplayBitsPerPixel on 10.7.
Cleanups from David Fang to get the package to build using clang.
+
+As of revision 325: 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
@@ -456,9 +445,6 @@
Remove a desktop file that gets generated only for users with GNOME/KDE
installed.
-Patch mkoctfile.in so that it uses Fink's compiler wrappers
-when building octave packages by hand. This is critical for 10.6/i386 users.
-
We have split the package up into runtime, development, and library packages,
to make upgrades easier for us and for users.
@@ -474,15 +460,37 @@
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.
+As of revision 325:
-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.
+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.
+
+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
+sure that anything that builds against Octave has the proper information when
+installed manually as well as via Fink, and is critical for 10.6/i386 (and 10.5
+/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 326:
+
+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
--- mkoctfile-gcc.info DELETED ---
------------------------------------------------------------------------------
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
