Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv5687
Modified Files:
qrupdate.info
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
Index: qrupdate.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci/qrupdate.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- qrupdate.info 27 Jun 2012 02:56:34 -0000 1.4
+++ qrupdate.info 5 Jul 2012 22:16:25 -0000 1.5
@@ -1,8 +1,8 @@
Info2: <<
-Package: qrupdate%type_pkg[-atlas]
+Package: qrupdate%type_pkg[-lapack]
Version: 1.1.2
-Revision: 3
-Type: -atlas (boolean), gcc (4.7)
+Revision: 4
+Type: -lapack (. -atlas -ref), gcc (4.7),
Source: mirror:sourceforge:%{Ni}/1.1/%{Ni}-%v.tar.gz
Source-MD5: 6d073887c6e858c24aeda5b54c57a8c4
@@ -19,20 +19,21 @@
Uses GNU 'install -D', so we patch that out and use 'mkdir -p' first to avoid
BuildDepends: coreutils-default.
-Use -ff2c on the non-ATLAS variant to be compatible with Accelerate.
+Use -ff2c on the base variant to be compatible with Accelerate.
<<
Maintainer: Alexander Hansen <[email protected]>
License: GPL
Homepage: http://qrupdate.sourceforge.net/
BuildDepends: <<
-(%type_raw[-atlas] != .) atlas (>=3.9.11-13),
+(%type_raw[-lapack] = -atlas) atlas,
+(%type_raw[-lapack] = -ref) lapack341,
gcc%type_pkg[gcc]-compiler
<<
Depends: %N-shlibs (=%v-%r)
BuildDependsOnly: true
-Conflicts: %{Ni}, %{Ni}-atlas
-Replaces: %{Ni}, %{Ni}-atlas
+Conflicts: %{Ni}, %{Ni}-atlas, %{Ni}-ref
+Replaces: %{Ni}, %{Ni}-atlas, %{Ni}-ref
PatchScript: <<
#!/bin/sh -ev
@@ -45,10 +46,17 @@
sed -i.orig -e 's|/usr/local|%p|g' \
-e '/FC/s|gfortran|&-fsf-%type_raw[gcc]|' Makeconf
# -ff2c need for darwin8's Accelerate framework
- if [ "%type_pkg[-atlas]" = "-atlas" ]
+ if [ "%type_pkg[-lapack]" = "-atlas" ]
then
- perl -pi -e "s|^(BLAS=)-lblas|LDFLAGS=$LDFLAGS
$MYLDFLAGS\n\1-lptcblas -lptf77blas -latlas|" Makeconf
+ perl -pi -e "s|^(BLAS=)-lblas|LDFLAGS=$LDFLAGS
$MYLDFLAGS\n\1-lptf77blas|" Makeconf
perl -pi -e "s|^(LAPACK=)-llapack|\1-lptlapack|" Makeconf
+ elif [ "%type_pkg[-lapack]" = "-ref" ]
+ then
+ export
PKG_CONFIG_PATH="%p/lib/lapack/pkgconfig:$PKG_CONFIG_PATH"
+ MYBLAS=`pkg-config --libs blas`
+ perl -pi -e " s|^(BLAS=).*|LDFLAGS=$LDFLAGS\n\1$MYBLAS|; \
+ s/(FFLAGS.*)-O3/\1-O2/" Makeconf
+ perl -pi -e "s|^(LAPACK=)-llapack|\1-lreflapack|" Makeconf
else
sed -i.orig2 \
-e '/FFLAGS/s|-O3|-ff2c -g &|' \
@@ -80,7 +88,8 @@
Package: %N-shlibs
Depends: <<
- (%type_raw[-atlas] != .) atlas-shlibs,
+ (%type_raw[-lapack] = -atlas) atlas-shlibs,
+ (%type_raw[-lapack] = -ref) lapack341-shlibs,
gcc%type_pkg[gcc]-shlibs
<<
Conflicts: qrupdate-atlas-shlibs, qrupdate-shlibs
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
