Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19859
Modified Files:
scipy-core-py.info
Added Files:
scipy-core-py.patch
Log Message:
Remove the -arch flag from the gfortran compiler flags in
the distutils module. See:
http://projects.scipy.org/numpy/ticket/1087
Also drop -py23 variant (we need at list python 2.4)
--- NEW FILE: scipy-core-py.patch ---
diff -ruN --exclude='*~' numpy-1.3.0/numpy/distutils/fcompiler/gnu.py
numpy-1.3.0.patched/numpy/distutils/fcompiler/gnu.py
--- numpy-1.3.0/numpy/distutils/fcompiler/gnu.py 2009-04-05
10:09:20.000000000 +0200
+++ numpy-1.3.0.patched/numpy/distutils/fcompiler/gnu.py 2009-04-16
13:43:04.000000000 +0200
@@ -259,13 +259,14 @@
def _universal_flags(self, cmd):
"""Return a list of -arch flags for every supported architecture."""
- if not sys.platform == 'darwin':
- return []
- arch_flags = []
- for arch in ["ppc", "i686"]:
- if self._can_target(cmd, arch):
- arch_flags.extend(["-arch", arch])
- return arch_flags
+ #if not sys.platform == 'darwin':
+ # return []
+ #arch_flags = []
+ #for arch in ["ppc", "i686"]:
+ # if self._can_target(cmd, arch):
+ # arch_flags.extend(["-arch", arch])
+ #return arch_flags
+ return []
def get_flags(self):
flags = GnuFCompiler.get_flags(self)
Index: scipy-core-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scipy-core-py.info,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- scipy-core-py.info 8 Apr 2009 09:22:58 -0000 1.25
+++ scipy-core-py.info 16 Apr 2009 12:23:02 -0000 1.26
@@ -2,13 +2,16 @@
Package: scipy-core-py%type_pkg[python]
Version: 1.3.0
-Revision: 1
+Revision: 2
Distribution: (%type_pkg[python] = 23) 10.4
Maintainer: Sebastien Maret <bma...@users.sourceforge.net>
-Type: python (2.3 2.4 2.5 2.6)
+Type: python (2.4 2.5 2.6)
Depends: python%type_pkg[python] | python%type_pkg[python]-nox
+BuildDepends: fink (>= 0.24.12)
Source: mirror:sourceforge:numpy/numpy-%v.tar.gz
Source-MD5: 3f7773ff0971a5ebb8591536d8ec7bd6
+PatchFile: scipy-core-py.patch
+PatchFile-MD5: 6f958d71eaa815741fdd569295205403
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]
@@ -27,6 +30,10 @@
Includes weave, f2py and scipy_distutils
<<
DescPackaging: <<
+The patch removes the -arch flag from the gfortran compiler flags in
+the distutils module. See:
+http://projects.scipy.org/numpy/ticket/1087
+
Originally packaged by Jeffrey Whitaker.
<<
License: OSI-Approved
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
