Merged revisions 69316 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69316 | tarek.ziade | 2009-02-05 23:52:52 +0100 (Thu, 05 Feb 2009) | 1 line
Fixed #5132: enable extensions to link on Solaris
........
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 7ef5bec..b12da63 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -229,10 +229,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'))
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
index 5275297..4c57232 100644
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -75,6 +75,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():
if not sysconfig.python_build:
if support.verbose:
diff --git a/Misc/NEWS b/Misc/NEWS
index 68cea16..20a4f89 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -155,6 +155,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.
- The shelve module now defaults to pickle protocol 3.