Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13498
Modified Files:
scipy-core-py.info scipy-core-py.patch
Log Message:
New upstream version.
Index: scipy-core-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scipy-core-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scipy-core-py.patch 20 Jan 2006 20:30:40 -0000 1.1
+++ scipy-core-py.patch 21 Feb 2006 17:11:38 -0000 1.2
@@ -1,11 +1,11 @@
---- numpy/numpy/distutils/fcompiler/gnu.py.orig 2006-01-07
07:19:24.000000000 -0700
-+++ numpy/numpy/distutils/fcompiler/gnu.py 2006-01-07 07:21:59.000000000
-0700
+--- numpy/numpy/distutils/fcompiler/gnu.py.orig 2006-01-23
06:25:07.000000000 -0700
++++ numpy/numpy/distutils/fcompiler/gnu.py 2006-01-23 06:21:38.000000000
-0700
@@ -29,7 +29,8 @@
'compiler_f77' : [fc_exe,"-Wall","-fno-second-underscore"],
'compiler_f90' : None,
'compiler_fix' : None,
- 'linker_so' : [fc_exe,"-Wall"],
-+# 'linker_so' : [fc_exe,"-Wall"],
++# 'linker_so' : [fc_exe,"-Wall"],
+ 'linker_so' : [fc_exe+" -undefined dynamic_lookup -bundle"],
'archiver' : ["ar", "-cr"],
'ranlib' : ["ranlib"],
@@ -13,7 +13,7 @@
@@ -64,7 +65,7 @@
os.environ['MACOSX_DEPLOYMENT_TARGET'] = '%s.%s' % (major,
minor)
-
+
- opt.extend(['-undefined', 'dynamic_lookup', '-bundle'])
+ #opt.extend(['-undefined', 'dynamic_lookup', '-bundle'])
else:
@@ -32,7 +32,17 @@
return opt
def get_flags_debug(self):
-@@ -224,7 +229,8 @@
+@@ -211,7 +216,8 @@
+ class Gnu95FCompiler(GnuFCompiler):
+
+ compiler_type = 'gnu95'
+- version_pattern = r'GNU Fortran 95 \(GCC (?P<version>[^\s*\)]+)'
++ version_pattern = r'GNU Fortran 95 ((\(GCC[^\)]*(\)\)|\)))|)\s*'\
++ '(?P<version>[^\s*\)]+)'
+
+ # 'gfortran --version' results:
+ # Debian: GNU Fortran 95 (GCC 4.0.3 20051023 (prerelease) (Debian
4.0.2-3))
+@@ -224,7 +230,8 @@
'compiler_f77' :
[fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
'compiler_f90' : [fc_exe,"-Wall","-fno-second-underscore"],
'compiler_fix' :
[fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
@@ -42,19 +52,79 @@
'archiver' : ["ar", "-cr"],
'ranlib' : ["ranlib"],
'linker_exe' : [fc_exe,"-Wall"]
---- numpy/numpy/distutils/fcompiler/ibm.py.orig 2006-01-07
07:19:32.000000000 -0700
-+++ numpy/numpy/distutils/fcompiler/ibm.py 2006-01-07 07:23:10.000000000
-0700
-@@ -15,7 +15,8 @@
- 'compiler_f77' : ["xlf"],
- 'compiler_fix' : ["xlf90", "-qfixed"],
- 'compiler_f90' : ["xlf90"],
+--- numpy/numpy/distutils/fcompiler/g95.py.orig 2006-01-23
06:25:18.000000000 -0700
++++ numpy/numpy/distutils/fcompiler/g95.py 2006-01-23 06:23:26.000000000
-0700
+@@ -9,14 +9,16 @@
+ class G95FCompiler(FCompiler):
+
+ compiler_type = 'g95'
+- version_pattern = r'G95.*\(experimental\) \(g95!\) (?P<version>.*)\).*'
++ version_pattern = r'G95 ((\(GCC[^\)]*(\)\)|\)))|)\s*'\
++ '(?P<version>[^\s*\)]+)'
+
+ executables = {
+ 'version_cmd' : ["g95", "--version"],
+ 'compiler_f77' : ["g95", "-ffixed-form"],
+ 'compiler_fix' : ["g95", "-ffixed-form"],
+ 'compiler_f90' : ["g95"],
+- 'linker_so' : ["g95","-shared"],
++ #'linker_so' : ["g95","-shared"],
++ 'linker_so' : ["g95 -undefined dynamic_lookup -bundle"],
+ 'archiver' : ["ar", "-cr"],
+ 'ranlib' : ["ranlib"]
+ }
+--- numpy/numpy/distutils/fcompiler/ibm.py.orig 2006-01-23
06:27:47.000000000 -0700
++++ numpy/numpy/distutils/fcompiler/ibm.py 2006-01-23 06:22:55.000000000
-0700
+@@ -4,18 +4,30 @@
+
+ from numpy.distutils.fcompiler import FCompiler
+ from distutils import log
++from numpy.distutils.exec_command import exec_command, find_executable
+
+ class IbmFCompiler(FCompiler):
+
+ compiler_type = 'ibm'
+ version_pattern = r'xlf\(1\)\s*IBM XL Fortran (Advanced Edition
|)Version (?P<version>[^\s*]*)'
+
++ for fc_exe in map(find_executable,['xlf']):
++ if os.path.isfile(fc_exe):
++ break
++ for f90_exe in map(find_executable,['xlf90']):
++ if os.path.isfile(f90_exe):
++ break
++ for f95_exe in map(find_executable,['xlf95']):
++ if os.path.isfile(f95_exe):
++ break
++
+ executables = {
+- 'version_cmd' : ["xlf"],
+- 'compiler_f77' : ["xlf"],
+- 'compiler_fix' : ["xlf90", "-qfixed"],
+- 'compiler_f90' : ["xlf90"],
- 'linker_so' : ["xlf95"],
++ 'version_cmd' : [fc_exe],
++ 'compiler_f77' : [fc_exe],
++ 'compiler_fix' : [f90_exe+" -qfixed"],
++ 'compiler_f90' : [f90_exe],
+ #'linker_so' : ["xlf95"],
-+ 'linker_so' : ["xlf95 -undefined dynamic_lookup -bundle"],
++ 'linker_so' : [f95_exe+" -undefined dynamic_lookup -bundle"],
'archiver' : ["ar", "-cr"],
'ranlib' : ["ranlib"]
}
-@@ -45,7 +46,8 @@
+@@ -31,9 +43,9 @@
+ l.sort()
+ l.reverse()
+ l = [d for d in l if
os.path.isfile(os.path.join(xlf_dir,d,'xlf.cfg'))]
+- if not l:
+- from distutils.version import LooseVersion
+- self.version = version = LooseVersion(l[0])
++ #if not l:
++ from distutils.version import LooseVersion
++ self.version = version = LooseVersion(l[0])
+ return version
+
+ def get_flags(self):
+@@ -45,7 +57,8 @@
def get_flags_linker_so(self):
opt = []
if sys.platform=='darwin':
@@ -64,15 +134,4 @@
else:
opt.append('-bshared')
version = self.get_version(ok_status=[0,40])
---- numpy/numpy/distutils/fcompiler/g95.py.orig 2006-01-07
07:26:45.000000000 -0700
-+++ numpy/numpy/distutils/fcompiler/g95.py 2006-01-07 07:23:39.000000000
-0700
-@@ -16,7 +16,8 @@
- 'compiler_f77' : ["g95", "-ffixed-form"],
- 'compiler_fix' : ["g95", "-ffixed-form"],
- 'compiler_f90' : ["g95"],
-- 'linker_so' : ["g95","-shared"],
-+ #'linker_so' : ["g95","-shared"],
-+ 'linker_so' : ["g95 -undefined dynamic_lookup -bundle"],
- 'archiver' : ["ar", "-cr"],
- 'ranlib' : ["ranlib"]
- }
+
Index: scipy-core-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scipy-core-py.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scipy-core-py.info 21 Jan 2006 15:26:27 -0000 1.2
+++ scipy-core-py.info 21 Feb 2006 17:11:38 -0000 1.3
@@ -1,13 +1,13 @@
Info2: <<
Package: scipy-core-py%type_pkg[python]
-Version: 0.9.2
+Version: 0.9.5
Revision: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
-Type: python (2.3 2.4)
+Type: python (2.2 2.3 2.4)
Depends: python%type_pkg[python] | python%type_pkg[python]-nox
Source: mirror:sourceforge:numpy/numpy-%v.tar.gz
-Source-MD5: 881841c4b471ae158106ba5d4ac4b573
+Source-MD5: 47fe186078c5e1f68b37e0ffc4994178
Conflicts: f2py-py%type_pkg[python], scipy-py%type_pkg[python] (<= 1:0.4)
Replaces: f2py-py%type_pkg[python], scipy-py%type_pkg[python] (<= 1:0.4)
Provides: numpy-py%type_pkg[python], f2py-py%type_pkg[python]
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
