Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv7218/sci
Modified Files:
arpack.info arpack.patch qrupdate.info
Log Message:
sync with 10.!4, needs -ff2c when using system vecLib, validated on
powerpc-darwin8
Index: qrupdate.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/qrupdate.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qrupdate.info 1 Sep 2011 01:09:08 -0000 1.1
+++ qrupdate.info 7 Sep 2011 04:09:43 -0000 1.2
@@ -1,7 +1,9 @@
-Package: qrupdate
+Info2: <<
+Package: qrupdate%type_pkg[-atlas]
Version: 1.1.1
-Revision: 1
-Source: mirror:sourceforge:%{Ni}/1.1/%N-%v.tar.gz
+Revision: 3
+Type: -atlas (boolean)
+Source: mirror:sourceforge:%{Ni}/1.1/%{Ni}-%v.tar.gz
Source-MD5: 7782c7ee6c234e56a72d6b86c1856fa0
Description: QR and Cholesky decomposition library
DescDetail: <<
@@ -29,17 +31,34 @@
PatchScript: <<
#!/bin/sh -ev
+ darwin_vers=`uname -r | cut -d. -f1`
+ if test $darwin_vers -ge 9
+ then LDFLAGS="-Wl,-dead_strip_dylibs"
+ else LDFLAGS=""
+ fi
+ echo "LDFLAGS = $LDFLAGS"
sed -i.orig -e 's|/usr/local|%p|g' \
- -e '/FC/s|gfortran|&-fsf-4.6|' \
- -e '/FFLAGS/s|-O3|-ff2c -g &|' \
+ -e '/FC/s|gfortran|&-fsf-4.6|' Makeconf
+ # -ff2c need for darwin8's Accelerate framework
+ if [ "%type_pkg[-atlas]" = "" ]
+ then sed -i.orig2 \
-e 's|-lblas||' \
-e 's|-llapack||' \
+ -e "/BLAS=/i\
+LDFLAGS=$LDFLAGS -framework Accelerate" \
Makeconf
+ if test $darwin_vers = 8
+ then sed -i.orig3 -e '/FFLAGS/s|-O3|-ff2c -g &|' Makeconf
+ fi
+ else sed -i.orig2 \
+ -e 's,lblas,lf77blas,' \
+ -e "/BLAS=/i\
+LDFLAGS=$LDFLAGS -L%p/lib" \
+ Makeconf
+ fi
sed -i.orig -e 's|install -D|install|g' src/Makefile
# recursive parallel Makefiles please -- fangism
sed -i.orig -e '/make -C/s|make|+&|' Makefile
- sed -i.orig2 -e '/BLAS=/i\
-LDFLAGS=-framework Accelerate' Makeconf
sed -i.orig -e '/FFLAGS.*LIBS/s|(FFLAGS)|& $(LDFLAGS)|' test/Makefile
<<
@@ -61,8 +80,9 @@
SplitOff: <<
Package: %N-shlibs
Depends: gcc46-shlibs
- Files: lib/lib%N.1*.dylib
+ Files: lib/lib%{Ni}.1*.dylib
DocFiles: COPYING README
- Shlibs: %p/lib/lib%N.1.dylib 0.0.0 %n (>= 1.1.1-1)
+ Shlibs: %p/lib/lib%{Ni}.1.dylib 0.0.0 %n (>= 1.1.1-1)
DescUsage: This package contains a shared library.
<<
+<<
Index: arpack.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/arpack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- arpack.patch 25 Aug 2011 08:06:59 -0000 1.2
+++ arpack.patch 7 Sep 2011 04:09:43 -0000 1.3
@@ -68,7 +68,7 @@
-FC = f77
-FFLAGS = -O -cg89
+FC = FINKPREFIX/bin/gfortran-fsf-4.6
-+FFLAGS = -O -ff2c -fPIC -fno-common
++FFLAGS = -O -fPIC -fno-common
LDFLAGS =
CD = cd
Index: arpack.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/arpack.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- arpack.info 4 Sep 2011 22:04:11 -0000 1.5
+++ arpack.info 7 Sep 2011 04:09:43 -0000 1.6
@@ -1,6 +1,6 @@
Package: arpack
Version: 96patched
-Revision: 4
+Revision: 5
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
Description: Solve large scale eigenvalue problems
DescDetail: <<
@@ -27,24 +27,29 @@
UseMaxBuildJobs: false
PatchFile: %n.patch
-PatchFile-MD5: 1efef09ba5fe29ba6edcff0b3ecc0287
+PatchFile-MD5: c21f6a329b48f1490bd84873a9acaac4
PatchScript: <<
#!/bin/sh -ev
sed -e 's|FINKPREFIX|%p|g' %{PatchFile} | patch -p1
- perl -pi -e 's|\$\(HOME\)/ARPACK|%b|' ARmake.inc
+ sed -i.orig -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
+ # -ff2c needed for compatibility with Accelerate framework (darwin8)
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
+ if test $darwin_vers = 8
+ then
+ sed -i.orig -e '/^FFLAGS/s|$| -ff2c|' ARmake.inc
+ for f in SRC/debug.h SRC/stat.h
+ do sed -i.orig -e '/common/,$s|^|c&|' $f
+ done
+ fi
<<
CompileScript: <<
- make all
- make arpackdylib
+ #!/bin/sh -ev
+ make -j1 all
+ make -j1 arpackdylib
<<
InstallScript: <<
#!/bin/sh -ev
@@ -71,6 +76,7 @@
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
------------------------------------------------------------------------------
Using storage to extend the benefits of virtualization and iSCSI
Virtualization increases hardware utilization and delivers a new level of
agility. Learn what those decisions are and how to modernize your storage
and backup environments for virtualization.
http://www.accelacomm.com/jaw/sfnl/114/51434361/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
