From 18c47f6a3b3cc848dc2fc09329954378e483dce1 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 13 Mar 2007 10:19:22 +0000 Subject: Patch #1569798: fix a bug in distutils when building Python from a directory within sys.exec_prefix. --- Lib/distutils/command/build_ext.py | 4 ++-- Misc/NEWS | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 542b77a..82474de 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -186,7 +186,7 @@ class build_ext (Command): # for extensions under Cygwin and AtheOS Python's library directory must be # appended to library_dirs if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos': - if string.find(sys.executable, sys.exec_prefix) != -1: + if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): # building third party extensions self.library_dirs.append(os.path.join(sys.prefix, "lib", "python" + get_python_version(), @@ -199,7 +199,7 @@ class build_ext (Command): # 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'): - if string.find(sys.executable, sys.exec_prefix) != -1: + if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): # building third party extensions self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) else: diff --git a/Misc/NEWS b/Misc/NEWS index 605d9b5..fa17fb9 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -646,6 +646,9 @@ Tools/Demos Build ----- +- Patch #1569798: fix a bug in distutils when building Python from a + directory within sys.exec_prefix. + - Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86. - Disable _XOPEN_SOURCE on NetBSD 1.x. -- cgit v0.12