Ticket #41122: patch.py-obspy.diff

File patch.py-obspy.diff, 4.4 KB (added by petrrr, 11 years ago)

updated fix, now works for py26 as well

  • Portfile

    old new  
    66
    77name                py-obspy
    88version             0.8.4
    9 revision            1
     9revision            2
    1010categories-append   science
    1111platforms           darwin
    1212maintainers         bo.ingv.it:Peter.Danecek openmaintainer
    … …  
    1515
    1616description         Python framework for processing seismological data
    1717
    18 long_description    ObsPy is an open-source project dedicated to provide a Python \
    19                     framework for processing seismological data. It provides \
    20                     support for file formats and signal processing routines \
    21                     which allow the manipulation, analysis and visualization \
    22                     of seismological time series. The goal of the ObsPy project is \
    23                     to facilitate rapid application development for seismology.
     18long_description    \
     19    ObsPy is an open-source project dedicated to provide a Python framework \
     20    for processing seismological data. It provides support for file formats \
     21    and signal processing routines which allow the manipulation, analysis \
     22    and visualization of seismological time series. The goal of the ObsPy \
     23    project is to facilitate rapid application development for seismology.
    2424
    2525homepage            http://obspy.org/
    2626
    2727use_zip             yes
    2828distname            obspy-${version}
    29 master_sites        http://pypi.python.org/packages/source/o/obspy
     29master_sites        https://pypi.python.org/packages/source/o/obspy/
    3030
    3131checksums           md5     9da79d3a0604d433085ad4dc0e430100 \
    3232                    rmd160  4a5b6e486304cd4e0a96d94ddc8bf88eb0a6f574 \
    3333                    sha256  6e9e0a5c0e673ae41d64ca265d4abdadf2b83a60ff27c516a8dbb0e2b38965cf
    3434
     35livecheck.type      regex
     36livecheck.url       ${master_sites}
     37livecheck.regex     ">obspy-(\\d+\\.\\d+\\.\\d+)\\.zip<"
     38
    3539python.versions     26 27
    3640
    3741if {${subport} != ${name}} {
    38     depends_build       port:py${python.version}-setuptools
    39     depends_lib-append  port:py${python.version}-numpy \
    40                         port:py${python.version}-scipy \
    41                         port:py${python.version}-lxml \
    42                         port:py${python.version}-suds \
    43                         port:py${python.version}-sqlalchemy
     42    depends_build-append    port:py${python.version}-setuptools
     43    depends_lib-append      port:py${python.version}-numpy \
     44                            port:py${python.version}-scipy \
     45                            port:py${python.version}-lxml \
     46                            port:py${python.version}-suds \
     47                            port:py${python.version}-sqlalchemy
    4448
    4549    # py-scipy is not universal
    4650    universal_variant   no
    … …  
    8690            depends_build-append port:gcc${ver_no_dot}
    8791
    8892            configure.fc  ${prefix}/bin/gfortran-mp-${ver}
    89             configure.f77 ${prefix}/bin/gfortran-mp-${ver}
    90             configure.f90 ${prefix}/bin/gfortran-mp-${ver}
     93            compiler.library_path ${prefix}/lib/gcc${ver_no_dot}
    9194        }
    9295    }
    9396}

  • files/patch-setup.py.diff

    old new  
    11--- setup.orig.py       2013-06-28 18:07:26.000000000 +0200
    2 +++ setup.py    2013-07-08 11:48:13.000000000 +0200
     2+++ setup.py    2013-11-19 20:30:09.000000000 +0100
    33@@ -27,7 +27,6 @@
    44 from distutils.unixccompiler import UnixCCompiler
    55 from setuptools import find_packages, setup
    … …  
    1414             return self._original_compile(obj, src, *args, **kwargs)
    1515-        UnixCCompiler.linker_so = ["gfortran"]
    1616-        self.compiler_so = ["gfortran"]
    17 +        UnixCCompiler.linker_so = [os.environ.get("F77")]
    18 +        self.compiler_so = [os.environ.get("F77")]
     17+        UnixCCompiler.linker_so = [os.environ.get("FC")]
     18+        self.compiler_so = [os.environ.get("FC")]
    1919         cc_args = ['-c', '-fno-underscoring']
    2020         cc_args.append('-fPIC')
    2121         try:
    22 @@ -621,7 +620,6 @@
    23      taupargs = []
    24  
    25      lib = MyExtension(lib_name,
    26 -                      libraries=['gfortran'],
    27                        extra_link_args=extra_link_args,
    28                        sources=[src + 'emdlv.f', src + 'libtau.f',
    29                                 src + 'ttimes_subrout.f'])
    30 @@ -629,8 +627,6 @@
     22@@ -629,8 +628,6 @@
    3123 
    3224 
    3325 def setupPackage(gfortran=True, ccompiler=True):