diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-30 20:05:35 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-30 20:05:35 (GMT) |
| commit | ac4b39f7f7b03f933b0c9a4b7993b9c11b7c5076 (patch) | |
| tree | bf20880ce9d3fc60b46603dfa62c01c3e26dffb9 | |
| parent | f29b6b4b773beecf69a0c059f452161d2cceda18 (diff) | |
| download | cpython-ac4b39f7f7b03f933b0c9a4b7993b9c11b7c5076.zip cpython-ac4b39f7f7b03f933b0c9a4b7993b9c11b7c5076.tar.gz cpython-ac4b39f7f7b03f933b0c9a4b7993b9c11b7c5076.tar.bz2 | |
Merged revisions 70746 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70746 | ronald.oussoren | 2009-03-30 15:02:08 -0500 (Mon, 30 Mar 2009) | 2 lines
Fix for issue 13095
........
| -rw-r--r-- | Doc/library/os.path.rst | 2 | ||||
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst index 795c9bc..4fce263 100644 --- a/Doc/library/os.path.rst +++ b/Doc/library/os.path.rst @@ -189,7 +189,7 @@ applications should use string objects to access all files. .. function:: normcase(path) - Normalize the case of a pathname. On Unix, this returns the path unchanged; on + Normalize the case of a pathname. On Unix and MacOSX, this returns the path unchanged; on case-insensitive filesystems, it converts the path to lowercase. On Windows, it also converts forward slashes to backward slashes. diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 0a93a4c..ea56ab0 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -644,6 +644,11 @@ def buildPython(): # several paths. version = getVersion() + # Since the extra libs are not in their installed framework location + # during the build, augment the library path so that the interpreter + # will find them during its extension import sanity checks. + os.environ['DYLD_LIBRARY_PATH'] = os.path.join(WORKDIR, + 'libraries', 'usr', 'local', 'lib') print "Running configure..." runCommand("%s -C --enable-framework --enable-universalsdk=%s " "--with-universal-archs=%s --with-computed-gotos" @@ -665,6 +670,7 @@ def buildPython(): runCommand("make frameworkinstallextras DESTDIR=%s"%( shellQuote(rootDir))) + del os.environ['DYLD_LIBRARY_PATH'] print "Copying required shared libraries" if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')): runCommand("mv %s/* %s"%( |