[27350] trunk/dports/python

[source_changes at macosforge.org]

Revision: 27350
          http://trac.macosforge.org/projects/macports/changeset/27350
Author:   erickt at macports.org
Date:     2007-07-30 09:48:42 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
fix some incompatibilities between the newer numpy and older scipy

Modified Paths:
--------------
    trunk/dports/python/py-numpy/Portfile
    trunk/dports/python/py-scipy/Portfile

Added Paths:
-----------
    trunk/dports/python/py-numpy/files/
    trunk/dports/python/py-numpy/files/g95.patch
    trunk/dports/python/py-scipy/files/
    trunk/dports/python/py-scipy/files/odr_setup.patch

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2007-07-30 16:23:37 UTC (rev 27349)
+++ trunk/dports/python/py-numpy/Portfile	2007-07-30 16:48:42 UTC (rev 27350)
@@ -5,7 +5,7 @@
 
 name                    py-numpy
 version                 1.0.3
-revision                0
+revision                1
 categories              python
 platforms               darwin
 maintainers             erickt at macports.org
@@ -20,5 +20,7 @@
                         sha1 1a4cf488e0549c9fda1300301ed2961f19742c8b \
                         rmd160 845e34d2d17c4dbb9cd239ab848493e3c0abd982
 
+patchfiles              g95.patch
+
 depends_lib             port:g95 \
                         lib:fftw:fftw-3 

Added: trunk/dports/python/py-numpy/files/g95.patch
===================================================================
--- trunk/dports/python/py-numpy/files/g95.patch	                        (rev 0)
+++ trunk/dports/python/py-numpy/files/g95.patch	2007-07-30 16:48:42 UTC (rev 27350)
@@ -0,0 +1,49 @@
+--- numpy/distutils/fcompiler/g95.py.old	2007-07-30 09:27:56.000000000 -0700
++++ numpy/distutils/fcompiler/g95.py	2007-07-30 09:30:51.000000000 -0700
+@@ -23,7 +23,7 @@
+         'compiler_f77' : ["g95", "-ffixed-form"],
+         'compiler_fix' : ["g95", "-ffixed-form"],
+         'compiler_f90' : ["g95"],
+-        'linker_so'    : ["g95","-shared"],
++        'linker_so'    : ["g95", "-g", "-Wall"],
+         'archiver'     : ["ar", "-cr"],
+         'ranlib'       : ["ranlib"]
+         }
+@@ -37,6 +37,37 @@
+         return ['-O']
+     def get_flags_debug(self):
+         return ['-g']
++    def get_flags_linker_so(self):
++        opt = self.linker_so[1:]
++        if sys.platform=='darwin':
++            # MACOSX_DEPLOYMENT_TARGET must be at least 10.3. This is
++            # a reasonable default value even when building on 10.4 when using
++            # the official Python distribution and those derived from it (when
++            # not broken).
++            target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', None)
++            if target is None or target == '':
++                target = '10.3'
++            major, minor = target.split('.')
++            if int(minor) < 3:
++                minor = '3'
++                warnings.warn('Environment variable '
++                    'MACOSX_DEPLOYMENT_TARGET reset to %s.%s' % (major, minor))
++            os.environ['MACOSX_DEPLOYMENT_TARGET'] = '%s.%s' % (major,
++                minor)
++
++            opt.extend(['-undefined', 'dynamic_lookup', '-bundle'])
++        else:
++            opt.append("-shared")
++        if sys.platform[:5]=='sunos':
++            # SunOS often has dynamically loaded symbols defined in the
++            # static library libg2c.a  The linker doesn't like this.  To
++            # ignore the problem, use the -mimpure-text flag.  It isn't
++            # the safest thing, but seems to work. 'man gcc' says:
++            # ".. Instead of using -mimpure-text, you should compile all
++            #  source code with -fpic or -fPIC."
++            opt.append('-mimpure-text')
++        return opt
++
+ 
+ if __name__ == '__main__':
+     from distutils import log

Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile	2007-07-30 16:23:37 UTC (rev 27349)
+++ trunk/dports/python/py-scipy/Portfile	2007-07-30 16:48:42 UTC (rev 27350)
@@ -5,7 +5,7 @@
 
 name                    py-scipy
 version                 0.5.2
-revision                0
+revision                1
 categories              python
 platforms               darwin
 maintainers             erickt at macports.org
@@ -20,6 +20,8 @@
                         sha1 879cfdbb2b2f7a8616737f828cd01790d222a636 \
                         rmd160 fa945185df7fc48e03bafdddeaaea72a8eb4914d
 
+patchfiles              odr_setup.patch
+
 depends_lib             lib:gnuplot:gnuplot \
                         port:py-numpy
 

Added: trunk/dports/python/py-scipy/files/odr_setup.patch
===================================================================
--- trunk/dports/python/py-scipy/files/odr_setup.patch	                        (rev 0)
+++ trunk/dports/python/py-scipy/files/odr_setup.patch	2007-07-30 16:48:42 UTC (rev 27350)
@@ -0,0 +1,11 @@
+--- Lib/odr/setup.py.old        2007-05-29 20:37:17.000000000 -0700
++++ Lib/odr/setup.py    2007-05-29 20:37:37.000000000 -0700
+@@ -6,7 +6,7 @@
+ import warnings
+ 
+ from numpy.distutils.core import Extension
+-from numpy.distutils.misc_util import get_path, Configuration, dot_join
++from numpy.distutils.misc_util import Configuration, dot_join
+ 
+ from numpy.distutils.system_info import get_info,dict_append,\
+      AtlasNotFoundError,LapackNotFoundError,BlasNotFoundError,\

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070730/5630e788/attachment.html