Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv30052
Modified Files:
arpack.info arpack.patch
Log Message:
sync with 10.!4, and also hack out common symbols from *.h to make dylib link
build with gcc46-compiler instead, %n-shlibs dep:gcc46-shlibs
!lart fortran
Index: arpack.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/arpack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- arpack.patch 11 Jul 2011 04:05:47 -0000 1.1
+++ arpack.patch 25 Aug 2011 08:06:59 -0000 1.2
@@ -1,5 +1,6 @@
---- ./ARmake.inc 2007-03-29 16:08:05.000000000 +0200
-+++ ./ARmake.inc 2007-03-29 16:08:15.000000000 +0200
+diff -urN ARPACK.orig/ARmake.inc ARPACK/ARmake.inc
+--- ARPACK.orig/ARmake.inc 1996-04-26 15:12:57.000000000 -0400
++++ ARPACK/ARmake.inc 2009-11-19 13:26:22.000000000 -0500
@@ -34,6 +34,11 @@
#
PLAT = SUN4
@@ -21,7 +22,7 @@
#
DIRS = $(BLASdir) $(LAPACKdir) $(UTILdir) $(SRCdir)
#
-@@ -51,17 +58,21 @@
+@@ -51,17 +58,22 @@
# | NOTE: ARPACK assumes the use of LAPACK version 2 codes. |
# %-------------------------------------------------------------------%
#
@@ -35,6 +36,7 @@
-ARPACKLIB = $(home)/libarpack_$(PLAT).a
-LAPACKLIB =
+ARPACKLIB = $(home)/libarpack.a
++ARPACKDYLIB = $(home)/libarpack.dylib
+PARPACKLIB = $(home)/libparpack.a
+LAPACKLIB = -framework Accelerate
BLASLIB =
@@ -46,18 +48,31 @@
#
#
# %---------------------------------------------------------%
-@@ -101,8 +112,8 @@
+@@ -91,9 +103,9 @@
+ # | Command to build .o files from .f files. |
+ # %-------------------------------------------%
+ #
+-.f.o:
+- @$(ECHO) Making $@ from $<
+- @$(FC) -c $(FFLAGS) $<
++#.f.o:
++# @$(ECHO) Making $@ from $<
++# @$(FC) -c $(FFLAGS) $<
+ #
+ # %-----------------------------------------%
+ # | Various compilation programs and flags. |
+@@ -101,8 +113,8 @@
# | for your system. |
# %-----------------------------------------%
#
-FC = f77
-FFLAGS = -O -cg89
-+FC = FINKPREFIX/bin/gfortran
-+FFLAGS = -O2 -ff2c
++FC = FINKPREFIX/bin/gfortran-fsf-4.6
++FFLAGS = -O -ff2c -fPIC -fno-common
LDFLAGS =
CD = cd
-@@ -112,7 +123,7 @@
+@@ -112,7 +124,7 @@
LN = ln
LNFLAGS = -s
@@ -66,9 +81,25 @@
RM = rm
RMFLAGS = -f
-diff -rubw ARPACK.orig/ARPACK/UTIL/second.f ARPACK/UTIL/second.f
---- ./UTIL/second.f 2007-03-29 16:08:05.000000000 +0200
-+++ ./UTIL/second.f 2007-03-29 16:08:15.000000000 +0200
+diff -urN ARPACK.orig/Makefile ARPACK/Makefile
+--- ARPACK.orig/Makefile 1996-09-24 10:55:31.000000000 -0400
++++ ARPACK/Makefile 2009-11-19 13:47:50.000000000 -0500
+@@ -64,6 +64,12 @@
+ done );
+ $(RANLIB) $(ARPACKLIB)
+
++arpackdylib: arpacklib tmp
++ ( cd tmp; ar -x $(ARPACKLIB) )
++ ( $(FC) $(FFLAGS) -dynamiclib -Wl,-undefined,dynamic_lookup
-install_name FINKPREFIX/lib/libarpack.0.dylib -compatibility_version 1.0.0
-current_version 1.0.0 tmp/*.o -o $(ARPACKDYLIB) )
++
++tmp:
++ ( mkdir tmp )
+ cleantest:
+
+ cleanlib:
+diff -urN ARPACK.orig/UTIL/second.f ARPACK/UTIL/second.f
+--- ARPACK.orig/UTIL/second.f 1995-10-02 14:56:44.000000000 -0400
++++ ARPACK/UTIL/second.f 2009-11-19 13:09:00.000000000 -0500
@@ -20,15 +20,15 @@
REAL TARRAY( 2 )
* ..
@@ -90,3 +121,4 @@
RETURN
*
* End of SECOND
+
Index: arpack.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/arpack.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- arpack.info 11 Jul 2011 04:05:47 -0000 1.1
+++ arpack.info 25 Aug 2011 08:06:59 -0000 1.2
@@ -1,12 +1,17 @@
Package: arpack
Version: 96patched
-Revision: 1
+Revision: 2
Maintainer: Alexander Hansen <[email protected]>
Description: Solve large scale eigenvalue problems
DescDetail: <<
ARPACK is a collection of Fortran77 subroutines designed to solve large scale
eigenvalue problems.
<<
+DescUsage: <<
+This package contains the header, static libraries, Fortran examples, and
+documentation.
+<<
+BuildDependsOnly: true
Homepage: http://www.caam.rice.edu/software/ARPACK
License: BSD
@@ -16,28 +21,65 @@
Source-MD5: fffaa970198b285676f4156cebc8626e
Source2-MD5: 14830d758f195f272b8594a493501fa2
SourceDirectory: ARPACK
-BuildDepends: fink (>=0.24.12), gcc44
+
+BuildDepends: fink (>=0.24.12), gcc46-compiler
+Depends: %N-shlibs (= %v-%r )
PatchFile: %n.patch
-PatchFile-MD5: 3da01c39e89e33ea51728b396966f485
+PatchFile-MD5: 1efef09ba5fe29ba6edcff0b3ecc0287
PatchScript: <<
+ #!/bin/sh -ev
sed -e 's|FINKPREFIX|%p|g' %{PatchFile} | patch -p1
perl -pi -e 's|\$\(HOME\)/ARPACK|%b|' ARmake.inc
+ # on darwin8, -fno-common still results in _debug_ and _timing_
+ # from SRC/debug.h and SRC/stat.h to appear in common section,
+ # which is forbidden for dynamic shared libraries,
+ # so we just comment them out and hope for the best -- fangism
+ darwin_vers=`uname -r | cut -d. -f1`
+ test $darwin_vers != 8 ||
+ for f in SRC/debug.h SRC/stat.h
+ do sed -i.orig -e '/common/,$s|^|c&|' $f
+ done
+<<
+CompileScript: <<
+ #!/bin/sh -ev
+ make -j1 all
+ make -j1 arpackdylib
<<
-
-CompileScript: make all
InstallScript: <<
+ #!/bin/sh -ev
install -d -v %i/lib
install -m 644 -v libarpack.a %i/lib
ranlib %i/lib/libarpack.a
+ mv libarpack.dylib libarpack.0.dylib
+ install -m 644 -v libarpack.0.dylib %i/lib
+ pushd %i/lib
+ ln -s libarpack.0.dylib libarpack.dylib
+ popd
install -d -v %i/share
- cp -r -v EXAMPLES %i/share
+ install -d -v %i/share/%n
+ cp -r -v EXAMPLES %i/share/%n
<<
DocFiles: DOCUMENTS
DescPackaging: <<
-Borrowed liberally from Macports.
-Needs a gfortran; I've arbitrarily chosen gcc44, as it's going to be the
-lowest-versioned one available on 10.6.
-Static-only library until I, or somebody else, figures out how to make it
-dynamic.
-<<
\ No newline at end of file
+ Borrowed liberally from Macports.
+ Needs a gfortran; I've arbitrarily chosen gcc46, as it's the
+ lowest-versioned one available on 10.7.
+<<
+DescPort: <<
+ Dynamic library originally courtesy of Ben Abbot. I've tweaked it to
+ have a nonzero compatibility_version and current_version.
+ Fortran files are built at -O0 to avoid runtime crashes--thanks to
+ Martin Costabel for bringing this up.
+ Makefiles are not parallel-safe, use -j1. (fangism)
+<<
+Splitoff: <<
+ Package: %N-shlibs
+ Depends: gcc46-shlibs
+ Files: lib/lib%N.0.dylib
+ Shlibs: %p/lib/lib%N.0.dylib 1.0.0 %n (>=0.96patched-2)
+ DescDetail: <<
+ This package contains a dynamic library.
+ <<
+ DocFiles: DOCUMENTS/README
+<<
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
