[113470] trunk/dports/python/py-numpy/files
Jeremy Huddleston Sequoia
jeremyhu at apple.com
Sun Nov 17 11:15:02 PST 2013
Why are you linking with "-undefined dynamic_lookup"?
That is almost always a sign of a masked bug without a proper fix.
You state that this fixes the +universal build, but #41396 has nothing to do with +universal and +universal was already building (r113429).
--Jeremy
On Nov 16, 2013, at 16:03, michaelld at macports.org wrote:
> Revision
> 113470
> Author
> michaelld at macports.org
> Date
> 2013-11-16 16:03:42 -0800 (Sat, 16 Nov 2013)
> Log Message
>
> py*-numpy:
> + fix patches to be current with 1.8.0;
> + addresses ticket #41396; numpy will build as +universal, though its binaries are not all universal (so, one step forward).
>
> Modified Paths
>
> • trunk/dports/python/py-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff
> • trunk/dports/python/py-numpy/files/patch-numpy_linalg_setup.py.diff
> • trunk/dports/python/py-numpy/files/patch-setup.py.diff
> Diff
>
> Modified: trunk/dports/python/py-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff (113469 => 113470)
>
> --- trunk/dports/python/py-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff 2013-11-16 22:54:57 UTC (rev 113469)
> +++ trunk/dports/python/py-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff 2013-11-17 00:03:42 UTC (rev 113470)
>
> @@ -1,6 +1,6 @@
>
> ---- numpy/distutils/fcompiler/__init__.py.orig 2013-10-31 13:24:12.000000000 +0400
> -+++ numpy/distutils/fcompiler/__init__.py 2013-10-31 13:45:03.000000000 +0400
> -@@ -815,7 +815,7 @@
>
> +--- numpy/distutils/fcompiler/__init__.py.orig 2013-10-28 19:21:02.000000000 -0400
> ++++ numpy/distutils/fcompiler/__init__.py 2013-11-16 08:43:03.000000000 -0500
> +@@ -817,7 +817,7 @@
>
> return compiler_type
>
>
>
> # Flag to avoid rechecking for Fortran compiler every time
>
> @@ -9,7 +9,7 @@
>
>
>
> def new_fcompiler(plat=None,
>
> compiler=None,
>
> -@@ -828,7 +828,8 @@
>
> +@@ -830,7 +830,8 @@
>
> platform/compiler combination.
>
> """
>
> global failed_fcompiler
>
> @@ -19,7 +19,7 @@
>
> return None
>
>
>
> load_all_fcompiler_classes()
>
> -@@ -848,7 +849,7 @@
>
> +@@ -850,7 +851,7 @@
>
> msg = msg + " Supported compilers are: %s)" \
>
> % (','.join(fcompiler_class.keys()))
>
> log.warn(msg)
>
> Modified: trunk/dports/python/py-numpy/files/patch-numpy_linalg_setup.py.diff (113469 => 113470)
>
> --- trunk/dports/python/py-numpy/files/patch-numpy_linalg_setup.py.diff 2013-11-16 22:54:57 UTC (rev 113469)
> +++ trunk/dports/python/py-numpy/files/patch-numpy_linalg_setup.py.diff 2013-11-17 00:03:42 UTC (rev 113470)
>
> @@ -1,10 +1,20 @@
>
> ---- numpy/linalg/setup.py.orig 2010-09-14 11:44:21.000000000 -0400
> -+++ numpy/linalg/setup.py 2010-09-14 11:45:01.000000000 -0400
> -@@ -27,6 +27,7 @@
> - 'zlapack_lite.c', 'dlapack_lite.c',
> - 'blas_lite.c', 'dlamch.c',
> - 'f2c_lite.c','f2c.h'],
> -+ extra_link_args=['-undefined dynamic_lookup -bundle'],
> - extra_info = lapack_info
>
> +--- numpy/linalg/setup.py.orig 2013-11-16 08:30:31.000000000 -0500
> ++++ numpy/linalg/setup.py 2013-11-16 08:39:27.000000000 -0500
> +@@ -37,7 +37,8 @@
> + config.add_extension('lapack_lite',
> + sources = [get_lapack_lite_sources],
> + depends = ['lapack_litemodule.c'] + lapack_lite_src,
> +- extra_info = lapack_info
> ++ extra_info = lapack_info,
> ++ extra_link_args=['-undefined dynamic_lookup -bundle']
>
> )
>
>
>
> + # umath_linalg module
> +@@ -47,6 +48,7 @@
> + depends = ['umath_linalg.c.src'] + lapack_lite_src,
> + extra_info = lapack_info,
> + libraries = ['npymath'],
> ++ extra_link_args=['-undefined dynamic_lookup -bundle']
> + )
> +
> + return config
>
> Modified: trunk/dports/python/py-numpy/files/patch-setup.py.diff (113469 => 113470)
>
> --- trunk/dports/python/py-numpy/files/patch-setup.py.diff 2013-11-16 22:54:57 UTC (rev 113469)
> +++ trunk/dports/python/py-numpy/files/patch-setup.py.diff 2013-11-17 00:03:42 UTC (rev 113470)
>
> @@ -1,6 +1,6 @@
>
> ---- numpy/core/setup.py.orig 2009-04-05 04:09:20.000000000 -0400
> -+++ numpy/core/setup.py 2009-04-08 19:53:45.000000000 -0400
> -@@ -309,7 +309,14 @@
>
> +--- numpy/core/setup.py.orig 2013-10-28 19:21:02.000000000 -0400
> ++++ numpy/core/setup.py 2013-11-16 08:45:06.000000000 -0500
> +@@ -480,7 +480,14 @@
>
> if isinstance(d, str):
>
> target_f.write('#define %s\n' % (d))
>
> else:
>
> @@ -16,7 +16,7 @@
>
>
>
> # define inline to our keyword, or nothing
>
> target_f.write('#ifndef __cplusplus\n')
>
> -@@ -393,7 +393,14 @@
>
> +@@ -576,7 +583,14 @@
>
> if isinstance(d, str):
>
> target_f.write('#define %s\n' % (d))
>
> else:
>
> @@ -30,5 +30,5 @@
>
> + target_f.write('#define %s %s\n' % (d[0], 4))
>
> + target_f.write('#endif\n')
>
>
>
> - # define NPY_INLINE to recognized keyword
> - target_f.write('#define NPY_INLINE %s\n' % inline)
>
> + # Define __STDC_FORMAT_MACROS
> + target_f.write("""
>
> _______________________________________________
> macports-changes mailing list
> macports-changes at lists.macosforge.org
> https://lists.macosforge.org/mailman/listinfo/macports-changes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4136 bytes
Desc: not available
URL: <http://lists.macosforge.org/pipermail/macports-dev/attachments/20131117/7f0d07e3/attachment.p7s>
More information about the macports-dev
mailing list