mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
Fixed #5132: enable extensions to link on Solaris
This commit is contained in:
parent
38870cb432
commit
0d4fd3493e
3 changed files with 29 additions and 3 deletions
|
@ -231,10 +231,12 @@ class build_ext (Command):
|
||||||
# building python standard extensions
|
# building python standard extensions
|
||||||
self.library_dirs.append('.')
|
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
|
# Python's library directory must be appended to library_dirs
|
||||||
if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
|
sysconfig.get_config_var('Py_ENABLE_SHARED')
|
||||||
and 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")):
|
if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
|
||||||
# building third party extensions
|
# building third party extensions
|
||||||
self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
|
self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
|
||||||
|
|
|
@ -67,6 +67,27 @@ class BuildExtTestCase(unittest.TestCase):
|
||||||
# XXX on Windows the test leaves a directory with xx module in TEMP
|
# 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')
|
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():
|
def test_suite():
|
||||||
src = _get_source_filename()
|
src = _get_source_filename()
|
||||||
if not os.path.exists(src):
|
if not os.path.exists(src):
|
||||||
|
|
|
@ -149,6 +149,9 @@ Core and Builtins
|
||||||
Library
|
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 #1581476: Always use the Tcl global namespace when calling into Tcl.
|
||||||
|
|
||||||
- Issue #2047: shutil.move() could believe that its destination path was
|
- Issue #2047: shutil.move() could believe that its destination path was
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue