Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv14250
Modified Files:
octave-3.0.5.info octave-3.2.4.info octave.patch
Log Message:
Fix compiler paths in mkoctfile in robust way for all Architectures/
Distributions. (thanks to J-F Mertens for the idea)
Use flag-sort to avoid saclib and saclib-gcc46 headers--now detected in
the fink-package-precedence line. (also JFM)
Get rid of -ff2c calls which appear not to be needed (on 10.5/10.6, anyway)
and which cause builds of the -atlas variant not to use atlas.
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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- octave-3.0.5.info 5 Sep 2011 11:16:25 -0000 1.10
+++ octave-3.0.5.info 5 Sep 2011 20:02:15 -0000 1.11
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (boolean), oct(3.0.5)
Version: 3.0.5
-Revision: 10
+Revision: 11
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
# disable atlas on 10.7 distro file until atlas is available
@@ -13,12 +13,13 @@
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
+ (%type_raw[-atlas] = atlas) atlas, flag-sort
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev
Suggests: %{Ni}%type_pkg[oct]-docs
GCC: 4.0
+
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}, (%type_raw[-atlas] != -atlas)
%{Ni}-atlas,
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
@@ -27,7 +28,7 @@
UseMaxBuildJobs: false
PatchFile: %{ni}.patch
-PatchFile-MD5: efef1c4d103b5c87d25ad1a2d0671469
+PatchFile-MD5: ce167f65e283dccf624e888c1a0a8725
PatchScript: <<
#!/bin/sh -ev
cp doc/interpreter/%{Ni}.1 doc/interpreter/%{Ni}-%v.1
@@ -42,9 +43,10 @@
for f in `grep -l -r "qhull_a\.h" src`
do sed -i.orig -e '/include/s|qhull/|lib&|' $f
done
- perl -pi -e 's/scripts doc/scripts/; s/INSTALL.OCTAVE//' Makefile
<<
+SetCC: flag-sort -r gcc
+SetCXX: flag-sort -r g++
SetCPPFLAGS: -I%p/opt/hdf5v1.6/include
SetLDFLAGS: -Wl,-dead_strip_dylibs -L%p/opt/hdf5v1.6/lib
SetLIBS: -lmetis
@@ -57,15 +59,15 @@
#!/bin/sh -ev
export CFLAGS='-O3 -MD'
export CXXFLAGS='-O3 -MD'
- export FFLAGS='-O3 -ff2c'
+ 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'
else a='--with-lapack=%p/lib/liblapack.dylib
--with-blas=%p/lib/libf77blas.dylib'
fi
FLIBDIR="%p/lib/gcc4.6/lib"
./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
src
+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
<<
InfoTest: <<
@@ -104,6 +106,7 @@
GNUTERM: aqua
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
+
SplitOff: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs
Conflicts: <<
@@ -173,12 +176,8 @@
share/man/man1/octave-config.1
<<
PostInstScript: <<
- os_version=`sw_vers -productVersion | cut -d. -f2`
- case $os_version in
- 7) sed -i.bak -e 's|@WRAPPER@|clang|'
%p/bin/mkoctfile-%v ;;
- 6) sed -i.bak -e 's|@WRAPPER@|10.6|'
%p/bin/mkoctfile-%v ;;
- 5) sed -i.bak -e 's|CC.*gcc|CC="/usr/bin/gcc|' -e
's|@WRAPPER@|g++-4.0|' %p/bin/mkoctfile-%v ;;
- esac
+ sed -i.bak -e '@WHICH_CC@|`which gcc`|g'
/%p/bin/mkoctfile-%type_raw[oct]
+ sed -i.bak -e '@WHICH_CXX@|`which g++`|g'
/%p/bin/mkoctfile-%type_raw[oct]
<<
DescDetail: <<
This package contains files needed to build against Octave, including
@@ -201,6 +200,7 @@
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
<<
+
Splitoff3: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]
Depends: <<
Index: octave.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- octave.patch 19 Aug 2011 21:33:58 -0000 1.12
+++ octave.patch 5 Sep 2011 20:02:15 -0000 1.13
@@ -257,45 +257,38 @@
.SH AUTHOR
John W. Eaton <j...@bevo.che.wisc.edu>
-diff -Nurd -x'*~' octave-@OCTVERSION@/mkoctfile.in
octave-@OCTVERSION@.patched/mkoctfile.in
---- octave-@OCTVERSION@/mkoctfile.in 2009-01-16 01:46:22.000000000 -0500
-+++ octave-@OCTVERSION@.patched/mkoctfile.in 2011-08-19 11:17:32.000000000
-0400
-@@ -36,6 +36,7 @@
- DEFAULT_LIBDIR=%OCTAVE_CONF_LIBDIR%
- DEFAULT_OCTINCLUDEDIR=%OCTAVE_CONF_OCTINCLUDEDIR%
- DEFAULT_OCTLIBDIR=%OCTAVE_CONF_OCTLIBDIR%
-+FINK_COMPILER_DIR=@FINKPREFIX@/var/lib/fink/path-prefix-@WRAPPER@
-
- if [ -n "$OCTAVE_HOME" ]; then
- DEFAULT_BINDIR="`echo $DEFAULT_BINDIR | $SED
"s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`"
-@@ -73,10 +74,10 @@
+diff -Naur octave-3.2.4/mkoctfile.in octave-3.2.4.patched/mkoctfile.in
+--- octave-3.2.4/mkoctfile.in 2009-05-25 02:04:59.000000000 -0400
++++ octave-3.2.4.patched/mkoctfile.in 2011-09-05 14:13:08.000000000 -0400
+@@ -71,10 +71,10 @@
: ${F77=%OCTAVE_CONF_F77%}
: ${FFLAGS=%OCTAVE_CONF_FFLAGS%}
: ${FPICFLAG=%OCTAVE_CONF_FPICFLAG%}
-: ${CC=%OCTAVE_CONF_CC%}
-+: ${CC=$FINK_COMPILER_DIR/%OCTAVE_CONF_CC%}
++: ${CC=@WHICH_CC@}
: ${CFLAGS=%OCTAVE_CONF_CFLAGS%}
: ${CPICFLAG=%OCTAVE_CONF_CPICFLAG%}
-: ${CXX=%OCTAVE_CONF_CXX%}
-+: ${CXX=$FINK_COMPILER_DIR/%OCTAVE_CONF_CXX%}
++: ${CXX=@WHICH_CXX@}
: ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%}
: ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%}
: ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%}
-@@ -85,7 +86,7 @@
+@@ -83,7 +83,7 @@
: ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%}
: ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%}
-: ${DL_LD=%OCTAVE_CONF_DL_LD%}
-+: ${DL_LD=$FINK_COMPILER_DIR/%OCTAVE_CONF_DL_LD%}
++: ${DL_LD=@WHICH_CXX@}
: ${DL_LDFLAGS=%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%}
: ${RLD_FLAG=%OCTAVE_CONF_RLD_FLAG%}
-@@ -98,7 +99,7 @@
+@@ -96,7 +96,7 @@
: ${FFTW_LIBS=%OCTAVE_CONF_FFTW_LIBS%}
: ${LIBS=%OCTAVE_CONF_LIBS%}
: ${FLIBS=%OCTAVE_CONF_FLIBS%}
-: ${LD_CXX=%OCTAVE_CONF_LD_CXX%}
-+: ${LD_CXX=$FINK_COMPILER_DIR/%OCTAVE_CONF_LD_CXX%}
++: ${LD_CXX=@WHICH_CXX@}
: ${LDFLAGS=%OCTAVE_CONF_LDFLAGS%}
: ${LD_STATIC_FLAG=%OCTAVE_CONF_LD_STATIC_FLAG%}
: ${LFLAGS=$DEFAULT_LFLAGS}
+
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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- octave-3.2.4.info 5 Sep 2011 11:16:25 -0000 1.8
+++ octave-3.2.4.info 5 Sep 2011 20:02:15 -0000 1.9
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (boolean), oct(3.2.4)
Version: 3.2.4
-Revision: 3
+Revision: 5
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
# disable atlas on 10.7 distro file until atlas is available
@@ -11,10 +11,10 @@
Source-MD5: 90c39fa9e241ad2e978bcee4682a2ba9
BuildDepends: <<
- arpack, glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
- libcurl4, libftgl2, qhull6-dev, qrupdate,
+ arpack (>= 96patched-5), glpk-dev, hdf5.7, readline5, libncurses5,
fftw3 (>= 3.1.1-7),
+ libcurl4, libftgl2, qhull6-dev, qrupdate (>=1.1.1-2), flag-sort,
pcre, gcc46-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
- graphicsmagick-dev, freetype219,
+ graphicsmagick-dev, freetype219, flag-sort,
(%type_raw[-atlas] = atlas) atlas
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
@@ -30,7 +30,7 @@
UseMaxBuildJobs: false
PatchFile: %{ni}.patch
-PatchFile-MD5: efef1c4d103b5c87d25ad1a2d0671469
+PatchFile-MD5: ce167f65e283dccf624e888c1a0a8725
PatchFile2: %{ni}-%v.patch
PatchFile2-MD5: 28dea047c7b3e51539a35b76249c8f67
PatchScript: <<
@@ -40,6 +40,9 @@
cp doc/interpreter/%{Ni}-config.1 doc/interpreter/%{Ni}-config-%v.1
cp doc/interpreter/mkoctfile.1 doc/interpreter/mkoctfile-%v.1
sed -e 's/@OCTVERSION@/%v/g' %{PatchFile} | patch -p1
+ # disable FLTK backend build since we have it already
+ patch -p1 < %{PatchFile2}
+ # add versioned manpages
sed -i -e 's|@FINKPREFIX@|%p|g' %{Ni}-forge* %{Ni}rc
doc/interpreter/*.1 mkoctfile.in
# fix lib name for qhull6
perl -pi -e 's|(qhull[/.])|lib\1|g ; s|lqhull|lqhull6|' configure
@@ -64,11 +67,10 @@
done
# missing qualifier to dependent-name member-function
sed -i.orig -e '/truncate_int/s|\(return\) \(truncate_int\)|\1
octave_int_base<T>::\2|' liboctave/oct-inttypes.h
- # disable FLTK backend
- patch -p1 < %{PatchFile2}
- perl -pi -e 's/scripts doc/scripts/; s/INSTALL.OCTAVE//' Makefile
<<
+SetCC: flag-sort -r gcc
+SetCXX: flag-sort -r g++
SetLDFLAGS: -Wl,-dead_strip_dylibs
SetLIBS: -lGraphicsMagick -lmetis
ConfigureParams: <<
@@ -81,15 +83,15 @@
#!/bin/sh -ev
export CFLAGS='-O3 -MD'
export CXXFLAGS='-O3 -MD'
- export FFLAGS='-O3 -ff2c'
+ 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'
else a='--with-lapack=%p/lib/liblapack.dylib
--with-blas=%p/lib/libf77blas.dylib'
fi
FLIBDIR="%p/lib/gcc4.6/lib"
./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
src
+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
<<
InfoTest: <<
@@ -150,7 +152,10 @@
%{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-shlibs, qrupdate-shlibs,
readline5-shlibs, (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
+ Depends: <<
+ fftw3-shlibs, gcc46-shlibs, hdf5.7-shlibs, qrupdate-shlibs (>=
1.1.1-2),
+ readline5-shlibs, (%type_raw[-atlas] = -atlas) atlas-shlibs (>=
3.8.1-1)
+ <<
Files: <<
lib/%{Ni}-%v
<<
@@ -204,12 +209,8 @@
share/man/man1/octave-config.1
<<
PostInstScript: <<
- os_version=`sw_vers -productVersion | cut -d. -f2`
- case $os_version in
- 7) sed -i.bak -e 's|@WRAPPER@|clang|'
%p/bin/mkoctfile-%v ;;
- 6) sed -i.bak -e 's|@WRAPPER@|10.6|'
%p/bin/mkoctfile-%v ;;
- 5) sed -i.bak -e 's|CC.*gcc|CC="/usr/bin/gcc|' -e
's|@WRAPPER@|g++-4.0|' %p/bin/mkoctfile-%v ;;
- esac
+ sed -i.bak -e '@WHICH_CC@|`which gcc`|g'
/%p/bin/mkoctfile-%type_raw[oct]
+ sed -i.bak -e '@WHICH_CXX@|`which g++`|g'
/%p/bin/mkoctfile-%type_raw[oct]
<<
DescDetail: <<
This package contains files needed to build against Octave, including
@@ -237,7 +238,7 @@
Package: octave%type_pkg[oct]%type_pkg[-atlas]
Depends: <<
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
- arpack-shlibs, fftw3-shlibs (>= 3.1.1-7), glpk-shlibs,
+ arpack-shlibs(>= 96patched-5), fftw3-shlibs (>= 3.1.1-7), glpk-shlibs,
graphicsmagick-shlibs, libcurl4-shlibs,
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs, pcre-shlibs,
qhull6-shlibs, (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1),
ncurses, gnuplot | gnuplot-nox | gnuplot-nogtk,
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
