Fix for issue 13095

diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index dd67a7c7684778a10c863f1d34f85977f3d3e6bd..bc2220dd448c9e14c7924b08c0909a4ca05970d8 100644 (file)
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -190,7 +190,7 @@ write files see :func:`open`, and for accessing the filesystem see the
 
 .. 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 c2cdb028cb8e901b880f5d334053ff7356da094a..d5da074cb4427ebcfd9e31d17c563b1d19271ec6 100755 (executable)
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -649,6 +649,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 "
@@ -670,6 +675,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"%(