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

[mojca at macports.org]

Revision: 114091
          https://trac.macports.org/changeset/114091
Author:   mojca at macports.org
Date:     2013-11-28 14:43:06 -0800 (Thu, 28 Nov 2013)
Log Message:
-----------
py-obspy: fix a problem with gfortran (maintainer, #41122)

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

Modified: trunk/dports/python/py-obspy/Portfile
===================================================================
--- trunk/dports/python/py-obspy/Portfile	2013-11-28 22:32:28 UTC (rev 114090)
+++ trunk/dports/python/py-obspy/Portfile	2013-11-28 22:43:06 UTC (rev 114091)
@@ -6,7 +6,7 @@
 
 name                py-obspy
 version             0.8.4
-revision            1
+revision            2
 categories-append   science
 platforms           darwin
 maintainers         bo.ingv.it:Peter.Danecek openmaintainer
@@ -35,17 +35,17 @@
 python.versions     26 27
 
 if {${subport} != ${name}} {
-    depends_build       port:py${python.version}-setuptools
-    depends_lib-append  port:py${python.version}-numpy \
-                        port:py${python.version}-scipy \
-                        port:py${python.version}-lxml \
-                        port:py${python.version}-suds \
-                        port:py${python.version}-sqlalchemy
+    depends_build-append    port:py${python.version}-setuptools
+    depends_lib-append      port:py${python.version}-numpy \
+                            port:py${python.version}-scipy \
+                            port:py${python.version}-lxml \
+                            port:py${python.version}-suds \
+                            port:py${python.version}-sqlalchemy
 
     # py-scipy is not universal
-    universal_variant   no
+    universal_variant       no
 
-    patchfiles          patch-setup.py.diff
+    patchfiles              patch-setup.py.diff
 
     set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
     set default_fortran_variant +gcc48
@@ -86,8 +86,7 @@
             depends_build-append port:gcc${ver_no_dot}
 
             configure.fc  ${prefix}/bin/gfortran-mp-${ver}
-            configure.f77 ${prefix}/bin/gfortran-mp-${ver}
-            configure.f90 ${prefix}/bin/gfortran-mp-${ver}
+            compiler.library_path ${prefix}/lib/gcc${ver_no_dot}
         }
     }
 }

Modified: trunk/dports/python/py-obspy/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-obspy/files/patch-setup.py.diff	2013-11-28 22:32:28 UTC (rev 114090)
+++ trunk/dports/python/py-obspy/files/patch-setup.py.diff	2013-11-28 22:43:06 UTC (rev 114091)
@@ -1,5 +1,5 @@
---- setup.orig.py	2013-06-28 18:07:26.000000000 +0200
-+++ setup.py	2013-07-08 11:48:13.000000000 +0200
+--- setup.orig.py
++++ setup.py
 @@ -27,7 +27,6 @@
  from distutils.unixccompiler import UnixCCompiler
  from setuptools import find_packages, setup
@@ -14,22 +14,14 @@
              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")]
++        UnixCCompiler.linker_so = [os.environ.get("FC")]
++        self.compiler_so = [os.environ.get("FC")]
          cc_args = ['-c', '-fno-underscoring']
          cc_args.append('-fPIC')
          try:
-@@ -621,7 +620,6 @@
-     taupargs = []
+@@ -629,8 +628,6 @@
  
-     lib = MyExtension(lib_name,
--                      libraries=['gfortran'],
-                       extra_link_args=extra_link_args,
-                       sources=[src + 'emdlv.f', src + 'libtau.f',
-                                src + 'ttimes_subrout.f'])
-@@ -629,8 +627,6 @@
  
- 
  def setupPackage(gfortran=True, ccompiler=True):
 -    # automatically install distribute if the user does not have it installed
 -    distribute_setup.use_setuptools()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131128/c7b7fcd1/attachment.html>