[102687] trunk/dports/python/py-obspy

[ryandesign at macports.org]

Revision: 102687
          https://trac.macports.org/changeset/102687
Author:   ryandesign at macports.org
Date:     2013-02-06 14:30:37 -0800 (Wed, 06 Feb 2013)
Log Message:
-----------
py-obspy: maintainer update to add gcc variants and use their fortran compiler (#37960)

Modified Paths:
--------------
    trunk/dports/python/py-obspy/Portfile

Added Paths:
-----------
    trunk/dports/python/py-obspy/files/
    trunk/dports/python/py-obspy/files/patch-setup.py.diff

Modified: trunk/dports/python/py-obspy/Portfile
===================================================================
--- trunk/dports/python/py-obspy/Portfile	2013-02-06 20:36:47 UTC (rev 102686)
+++ trunk/dports/python/py-obspy/Portfile	2013-02-06 22:30:37 UTC (rev 102687)
@@ -6,6 +6,7 @@
 
 name                py-obspy
 version             0.8.3
+revision            1
 categories-append   science
 platforms           darwin
 maintainers         bo.ingv.it:Peter.Danecek openmaintainer
@@ -43,4 +44,35 @@
 
     # py-scipy is not universal
     universal_variant   no
+
+    patchfiles          patch-setup.py.diff
+
+    variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 description {Compile with gcc 4.3} {
+        depends_lib-append port:gcc43
+        configure.compiler macports-gcc-4.3
+    }
+
+    variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 description {Compile with gcc 4.4} {
+        depends_lib-append port:gcc44
+        configure.compiler macports-gcc-4.4
+    }
+
+    variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 description {Compile with gcc 4.5} {
+        depends_lib-append port:gcc45
+        configure.compiler macports-gcc-4.5
+    }
+
+    variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 description {Compile with gcc 4.6} {
+        depends_lib-append port:gcc46
+        configure.compiler macports-gcc-4.6
+    }
+
+    variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 description {Compile with gcc 4.7} {
+        depends_lib-append port:gcc47
+        configure.compiler macports-gcc-4.7
+    }
+
+    if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47]} {
+        default_variants +gcc45
+    }
 }

Added: trunk/dports/python/py-obspy/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-obspy/files/patch-setup.py.diff	                        (rev 0)
+++ trunk/dports/python/py-obspy/files/patch-setup.py.diff	2013-02-06 22:30:37 UTC (rev 102687)
@@ -0,0 +1,21 @@
+--- setup.orig.py	2012-12-17 14:04:38.000000000 +0100
++++ setup.py	2013-02-06 18:52:13.000000000 +0100
+@@ -362,8 +362,8 @@
+             # otherwise we just use the original compile method
+             UnixCCompiler.linker_so = None
+             return self._original_compile(obj, src, *args, **kwargs)
+-        UnixCCompiler.linker_so = ["gfortran"]
+-        self.compiler_so = ["gfortran"]
++        UnixCCompiler.linker_so = [os.environ.get("F77")]
++        self.compiler_so = [os.environ.get("F77")]
+         cc_args = ['-c', '-fno-underscoring']
+         if sys.platform == 'darwin':
+             self.compiler_so = _darwin_compiler_fixup(self.compiler_so,
+@@ -607,7 +607,6 @@
+     # setup Fortran extension
+     src = os.path.join('obspy', 'taup', 'src') + os.sep
+     lib = MyExtension(lib_name,
+-                      libraries=['gfortran'],
+                       sources=[src + 'emdlv.f', src + 'libtau.f',
+                                src + 'ttimes_subrout.f'])
+     return lib
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130206/898700ae/attachment.html>