[Python-checkins] r69316 - in python/trunk: Lib/distutils/command/build_ext.py Lib/distutils/tests/test_build_ext.py Misc/NEWS
tarek.ziade
python-checkins at python.org
Thu Feb 5 23:52:52 CET 2009
Author: tarek.ziade
Date: Thu Feb 5 23:52:52 2009
New Revision: 69316
Log:
Fixed #5132: enable extensions to link on Solaris
Modified:
python/trunk/Lib/distutils/command/build_ext.py
python/trunk/Lib/distutils/tests/test_build_ext.py
python/trunk/Misc/NEWS
Modified: python/trunk/Lib/distutils/command/build_ext.py
==============================================================================
--- python/trunk/Lib/distutils/command/build_ext.py (original)
+++ python/trunk/Lib/distutils/command/build_ext.py Thu Feb 5 23:52:52 2009
@@ -231,10 +231,12 @@
# building python standard extensions
self.library_dirs.append('.')
- # for extensions under Linux with a shared Python library,
+ # for extensions under Linux or Solaris with a shared Python library,
# Python's library directory must be appended to library_dirs
- if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
- and sysconfig.get_config_var('Py_ENABLE_SHARED'):
+ sysconfig.get_config_var('Py_ENABLE_SHARED')
+ if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')
+ or sys.platform.startswith('sunos'))
+ and sysconfig.get_config_var('Py_ENABLE_SHARED')):
if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
# building third party extensions
self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
Modified: python/trunk/Lib/distutils/tests/test_build_ext.py
==============================================================================
--- python/trunk/Lib/distutils/tests/test_build_ext.py (original)
+++ python/trunk/Lib/distutils/tests/test_build_ext.py Thu Feb 5 23:52:52 2009
@@ -67,6 +67,27 @@
# XXX on Windows the test leaves a directory with xx module in TEMP
shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
+ def test_solaris_enable_shared(self):
+ dist = Distribution({'name': 'xx'})
+ cmd = build_ext(dist)
+ old = sys.platform
+
+ sys.platform = 'sunos' # fooling finalize_options
+ from distutils.sysconfig import _config_vars
+ old_var = _config_vars.get('Py_ENABLE_SHARED')
+ _config_vars['Py_ENABLE_SHARED'] = 1
+ try:
+ cmd.ensure_finalized()
+ finally:
+ sys.platform = old
+ if old_var is None:
+ del _config_vars['Py_ENABLE_SHARED']
+ else:
+ _config_vars['Py_ENABLE_SHARED'] = old_var
+
+ # make sur we get some lobrary dirs under solaris
+ self.assert_(len(cmd.library_dirs) > 0)
+
def test_suite():
src = _get_source_filename()
if not os.path.exists(src):
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Thu Feb 5 23:52:52 2009
@@ -149,6 +149,9 @@
Library
-------
+- Issue #5132: Fixed trouble building extensions under Solaris with
+ --enabled-shared activated. Initial patch by Dave Peterson.
+
- Issue #1581476: Always use the Tcl global namespace when calling into Tcl.
- Issue #2047: shutil.move() could believe that its destination path was
More information about the Python-checkins
mailing list