summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch')
-rw-r--r--dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch83
1 files changed, 0 insertions, 83 deletions
diff --git a/dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch b/dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch
deleted file mode 100644
index e96611df13ff..000000000000
--- a/dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-gfortran -v happily accepts any -arch X argument, but also happily dies
-during compilation that it doesn't understand -arch argument. Hence,
-testing if -arch is supported like this is kind of not working well.
-
-Since Apple does not officially ship fortran support (any), I wonder how
-universal support could have crept into this piece of code all. They
-don't even have an Apple GCC compiler with fortran support (like we do
-with Gentoo Prefix).
-
-http://projects.scipy.org/numpy/ticket/1087
-
-
---- numpy/distutils/fcompiler/gnu.py
-+++ numpy/distutils/fcompiler/gnu.py
-@@ -12,13 +12,6 @@
-
- TARGET_R = re.compile("Target: ([a-zA-Z0-9_\-]*)")
-
--# XXX: do we really need to check for target ? If the arch is not supported,
--# the return code should be != 0
--_R_ARCHS = {"ppc": r"^Target: (powerpc-.*)$",
-- "i686": r"^Target: (i686-.*)$",
-- "x86_64": r"^Target: (i686-.*)$",
-- "ppc64": r"^Target: (powerpc-.*)$",}
--
- class GnuFCompiler(FCompiler):
- compiler_type = 'gnu'
- compiler_aliases = ('g77',)
-@@ -215,6 +208,7 @@
- # OS X: GNU Fortran 95 (GCC) 4.1.0
- # GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental)
- # GNU Fortran (GCC) 4.3.0 20070316 (experimental)
-+ # GNU Fortran (GCC) 4.2.1 (Apple Inc. build 5574)
-
- possible_executables = ['gfortran', 'f95']
- executables = {
-@@ -241,46 +235,6 @@
-
- g2c = 'gfortran'
-
-- # Note that this is here instead of GnuFCompiler as gcc < 4 uses a
-- # different output format (which isn't as useful) than gcc >= 4,
-- # and we don't have to worry about g77 being universal (as it can't be).
-- def _can_target(self, cmd, arch):
-- """Return true is the compiler support the -arch flag for the given
-- architecture."""
-- newcmd = cmd[:]
-- newcmd.extend(["-arch", arch, "-v"])
-- st, out = exec_command(" ".join(newcmd))
-- if st == 0:
-- for line in out.splitlines():
-- m = re.search(_R_ARCHS[arch], line)
-- if m:
-- return True
-- return False
--
-- 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
--
-- def get_flags(self):
-- flags = GnuFCompiler.get_flags(self)
-- arch_flags = self._universal_flags(self.compiler_f90)
-- if arch_flags:
-- flags[:0] = arch_flags
-- return flags
--
-- def get_flags_linker_so(self):
-- flags = GnuFCompiler.get_flags_linker_so(self)
-- arch_flags = self._universal_flags(self.linker_so)
-- if arch_flags:
-- flags[:0] = arch_flags
-- return flags
--
- def get_library_dirs(self):
- opt = GnuFCompiler.get_library_dirs(self)
- if sys.platform == 'win32':