tags 472314 patch upstream
thanks
Josselin Mouette wrote:
The xmmsapi.so modules in this package link to libpython, which is
incorrect because it makes the package depend on both python2.4 and
python2.5.
Interesting..
$ ldd
/usr/lib/python-support/python-xmmsclient/python2.4/xmmsclient/xmmsapi.so
linux-gate.so.1 => (0xffffe000)
libxmmsclient.so.3 => /usr/lib/libxmmsclient.so.3 (0xb7e8a000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb7d2f000)
/lib/ld-linux.so.2 (0x80000000)
$ ldd
/usr/lib/python-support/python-xmmsclient/python2.5/xmmsclient/xmmsapi.so
linux-gate.so.1 => (0xffffe000)
libxmmsclient.so.3 => /usr/lib/libxmmsclient.so.3 (0xb7f30000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb7f0a000)
libpthread.so.0 => /lib/i686/cmov/libpthread.so.0 (0xb7ef0000)
libdl.so.2 => /lib/i686/cmov/libdl.so.2 (0xb7eec000)
libutil.so.1 => /lib/i686/cmov/libutil.so.1 (0xb7ee8000)
libpython2.5.so.1.0 => /usr/lib/libpython2.5.so.1.0 (0xb7daf000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb7c54000)
/lib/ld-linux.so.2 (0x80000000)
$ python2.4 -c 'import distutils.sysconfig; print
distutils.sysconfig.get_config_var("Py_ENABLE_SHARED")'
None
$ python2.5 -c 'import distutils.sysconfig; print
distutils.sysconfig.get_config_var("Py_ENABLE_SHARED")'
0
diff --git a/wafadmin/Tools/python.py b/wafadmin/Tools/python.py
index ecc0a46..a78a054 100644
--- a/wafadmin/Tools/python.py
+++ b/wafadmin/Tools/python.py
@@ -151,7 +151,7 @@ int main(int argc, char *argv[]) { Py_Initialize(); Py_Finalize(); return 0; }
# according to
# distutils.command.build_ext.build_ext.get_libraries.__doc__
# this might want to be OS/2 aswell.
- if sys.platform == 'win32' or (Py_ENABLE_SHARED is not None
+ if sys.platform == 'win32' or (Py_ENABLE_SHARED
and sys.platform != 'darwin'):
conf.env['LIBPATH_PYEXT'] = conf.env['LIBPATH_PYEMBED']
conf.env['LIB_PYEXT'] = conf.env['LIB_PYEMBED']
