Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv13419
Modified Files:
arpack-oct.info
Added Files:
arpack-oct.patch
Log Message:
Courtesy of J. Howarth, fix use of clang on 10.7.
Also do some housekeeping, and sync with the 10.4 tree.
Index: arpack-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/arpack-oct.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- arpack-oct.info 28 Feb 2012 15:50:38 -0000 1.9
+++ arpack-oct.info 18 Mar 2012 02:29:26 -0000 1.10
@@ -2,7 +2,7 @@
Package: arpack%type_pkg[-atlas]-oct%type_pkg[oct]
Version: 1.0.8
Type: oct (3.0.5), forge (arpack), -atlas (boolean)
-Revision: 4
+Revision: 5
Maintainer: Alexander Hansen <[email protected]>
# unfortunately, Homepage won't do types
Homepage: http://octave.sourceforge.net/
@@ -12,23 +12,13 @@
<<
License: GPL2
-# 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: <<
arpack-ng%type_pkg[-atlas] (>= 3.0.1-2),
(%type_raw[-atlas] = -atlas) atlas,
(%type_raw[-atlas] = -atlas) liboctave%type_pkg[oct]-atlas-dev,
(%type_raw[-atlas] != -atlas) liboctave%type_pkg[oct]-veclib-dev,
fftw3,
- ( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
- ( %type_pkg[oct] != 305 ) hdf5.7
+ ( %type_pkg[oct] = 305 ) hdf5.7-oldapi
<<
Depends: <<
arpack-ng%type_pkg[-atlas]-shlibs (>= 3.0.1-2),
@@ -47,16 +37,11 @@
<<
Source-MD5: dbf767019e238c4a16ccc6cac2afe87c
+PatchFile: arpack-oct.patch
+PatchFile-MD5: 29b0eda3b470878348f2b26b3373f1ed
#### Insert required changes here ####
-SetCC: llvm-gcc-4.2
-SetCXX: llvm-g++-4.2
-
-DescPort: <<
-Appears not to get along with clang, at least as of Xcode-4.2
-<<
-
######################################
# Do not change anything from this point down, unless absolutely necessary,
@@ -70,7 +55,16 @@
SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
SetMAKEFLAGS: -j1
-CompileScript: env OCTAVE=%p/bin/octave-%type_raw[oct]
%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
+CompileScript: <<
+#!/bin/sh -ev
+if [ $UID -ne 0 ]
+then
+ echo "%n cannot be built with --build-as-nobody"
+ exit 1
+fi
+export OCTAVE=%p/bin/octave-%type_raw[oct]
+%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
+<<
InstallScript: <<
#!/bin/sh -ev
@@ -86,7 +80,8 @@
PostInstScript: <<
if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f
%p/var/octave/%type_raw[oct]/octave_packages ]
- then
+ then
+ echo "foo"
%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
@@ -104,4 +99,4 @@
The Type: forge (pkgname) is used to minimize what needs to be changed when
using this .info file as a template.
<<
-<<
\ No newline at end of file
+<<
--- NEW FILE: arpack-oct.patch ---
--- arpack-1.0.8/src/eigs-base.cc.orig 2012-03-11 15:40:48.000000000 -0400
+++ arpack-1.0.8/src/eigs-base.cc 2012-03-11 15:42:18.000000000 -0400
@@ -3711,43 +3711,43 @@
#endif
#ifndef _MSC_VER
-template static octave_idx_type
+template octave_idx_type
lusolve (const SparseMatrix&, const SparseMatrix&, Matrix&);
-template static octave_idx_type
+template octave_idx_type
lusolve (const SparseComplexMatrix&, const SparseComplexMatrix&,
ComplexMatrix&);
-template static octave_idx_type
+template octave_idx_type
lusolve (const Matrix&, const Matrix&, Matrix&);
-template static octave_idx_type
+template octave_idx_type
lusolve (const ComplexMatrix&, const ComplexMatrix&, ComplexMatrix&);
-template static ComplexMatrix
+template ComplexMatrix
ltsolve (const SparseComplexMatrix&, const ColumnVector&,
const ComplexMatrix&);
-template static Matrix
+template Matrix
ltsolve (const SparseMatrix&, const ColumnVector&, const Matrix&);
-template static ComplexMatrix
+template ComplexMatrix
ltsolve (const ComplexMatrix&, const ColumnVector&, const ComplexMatrix&);
-template static Matrix
+template Matrix
ltsolve (const Matrix&, const ColumnVector&, const Matrix&);
-template static ComplexMatrix
+template ComplexMatrix
utsolve (const SparseComplexMatrix&, const ColumnVector&,
const ComplexMatrix&);
-template static Matrix
+template Matrix
utsolve (const SparseMatrix&, const ColumnVector&, const Matrix&);
-template static ComplexMatrix
+template ComplexMatrix
utsolve (const ComplexMatrix&, const ColumnVector&, const ComplexMatrix&);
-template static Matrix
+template Matrix
utsolve (const Matrix&, const ColumnVector&, const Matrix&);
#endif
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
