On Sun, Jan 31, 2010 at 12:27:46PM -0500, Yaroslav Halchenko wrote:
> cool, it seems that a simple
>
> - export PYTHONPATH=$$PWD/`/bin/ls -d build/lib.*`; cd doc; $(MAKE) html pdf
> + export PYTHONPATH=$$PWD/`/bin/ls -d build/lib.*`
> MPLCONFIGDIR=$(CURDIR)/build; cd doc; $(MAKE) html pdf
>
> is sufficient enough. With your patch to fix fortran issues (thanks!),
> it now indeed makes sense to close this bugreport ;)
>
> May be you have an atomic patch for fortran issue so I could use
> it instead of my editing of output interdiff between -2 and -2.1 in attempt
> to get it ?
I've attached it FYI.
Kumar
--
In this playhouse of infinite forms I have had my play, and here have
I caught sight of him that is formless.
- Rabindranath Tagore (Gitanjali, 1912)
--- nipy-0.1.2+1741.orig/nipy/neurospin/group/setup.py
+++ nipy-0.1.2+1741/nipy/neurospin/group/setup.py
@@ -1,4 +1,4 @@
-
+import sys
def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
@@ -21,27 +21,23 @@
config.add_extension(
'_onesample',
sources=['_onesample.c'],
- libraries=['fffpy'],
- extra_info=lapack_info,
- )
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
config.add_extension(
'_twosample',
sources=['_twosample.c'],
- libraries=['fffpy'],
- extra_info=lapack_info,
- )
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
config.add_extension(
'routines',
sources=['routines.c'],
- libraries=['fffpy'],
- extra_info=lapack_info,
- )
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
config.add_extension(
'glm_twolevel',
sources=['glm_twolevel.c'],
- libraries=['fffpy'],
- extra_info=lapack_info,
- )
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
return config
--- nipy-0.1.2+1741.orig/nipy/neurospin/utils/setup.py
+++ nipy-0.1.2+1741/nipy/neurospin/utils/setup.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
+import sys
def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
@@ -17,9 +17,8 @@
config.add_extension(
'routines',
sources=['routines.c'],
- libraries=['fffpy'],
- extra_info=lapack_info,
- )
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
return config
--- nipy-0.1.2+1741.orig/nipy/neurospin/bindings/setup.py
+++ nipy-0.1.2+1741/nipy/neurospin/bindings/setup.py
@@ -36,15 +36,14 @@
lapack_info = get_info('lapack',0)
config.add_extension('linalg', sources=['linalg.c'],
- libraries=['fffpy'],
- extra_info=lapack_info)
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
config.add_extension('array', sources=['array.c'],
- libraries=['fffpy'],
- extra_info=lapack_info)
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
config.add_extension('wrapper', sources=['wrapper.c'],
- libraries=['fffpy'],
- extra_info=lapack_info)
-
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
return config
--- nipy-0.1.2+1741.orig/nipy/neurospin/graph/setup.py
+++ nipy-0.1.2+1741/nipy/neurospin/graph/setup.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
+import sys
def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
@@ -19,15 +19,13 @@
config.add_extension(
'_graph',
sources=['graph.c'],
- libraries=['fffpy'],
- extra_info=lapack_info,
- )
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
config.add_extension(
'_field',
sources=['field.c'],
- libraries=['fffpy'],
- extra_info=lapack_info,
- )
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
return config
--- nipy-0.1.2+1741.orig/nipy/neurospin/glm/setup.py
+++ nipy-0.1.2+1741/nipy/neurospin/glm/setup.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
+import sys
def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
@@ -20,9 +20,8 @@
config.add_extension(
'kalman',
sources=['kalman.c'],
- libraries=['fffpy'],
- extra_info=lapack_info,
- )
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
return config
--- nipy-0.1.2+1741.orig/nipy/neurospin/registration/setup.py
+++ nipy-0.1.2+1741/nipy/neurospin/registration/setup.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
+import sys
def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
@@ -19,14 +19,13 @@
config.add_extension(
'_iconic',
sources=['_iconic.c'],
- libraries=['fffpy'],
- extra_info=lapack_info,
- )
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
config.add_extension(
'_transform_affine',
sources=['_transform_affine.c'],
- libraries=['fffpy'],
- extra_info=lapack_info,
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared']
)
return config
--- nipy-0.1.2+1741.orig/nipy/neurospin/clustering/setup.py
+++ nipy-0.1.2+1741/nipy/neurospin/clustering/setup.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
+import sys
def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
@@ -20,9 +20,8 @@
config.add_extension(
'_clustering',
sources=['clustering.c'],
- libraries=['fffpy'],
- extra_info=lapack_info,
- )
+ libraries=['fffpy', 'python'+sys.version[:3]],
+ extra_info=lapack_info, extra_link_args=['-shared'])
return config