- Issue #17752: Fix distutils tests when run from the installed location.

diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
index 4e6058d0ec0e67468dcd2e07350114fafec07f97..96dcd948d8ada7732a96d344b2a84a823e546d9c 100644 (file)
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -218,4 +218,4 @@ def fixup_build_ext(cmd):
                 cmd.library_dirs = []
             else:
                 name, equals, value = runshared.partition('=')
-                cmd.library_dirs = value.split(os.pathsep)
+                cmd.library_dirs = [d for d in value.split(os.pathsep) if d]

diff --git a/Misc/NEWS b/Misc/NEWS
index e71c04965b5a546df872697e0f07f742f3cddd92..9e50bc895fad6a64bbd614f37760bf0358be3a39 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -329,6 +329,8 @@ IDLE
 Tests
 -----
 
+- Issue #17752: Fix distutils tests when run from the installed location.
+
 - Issue #18604: Consolidated checks for GUI availability.  All platforms now
   at least check whether Tk can be instantiated when the GUI resource is
   requested.

diff --git a/configure b/configure
index 15ecda5b253ddefe58377f1c4d6829ca9959c47a..2e32be29635ed90adf8e8856e49438caada393b9 100755 (executable)
--- a/configure
+++ b/configure
@@ -5326,7 +5326,7 @@ $as_echo_n "checking LDLIBRARY... " >&6; }
 if test "$enable_framework"
 then
   LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-  RUNSHARED=DYLD_FRAMEWORK_PATH="`pwd`:$DYLD_FRAMEWORK_PATH"
+  RUNSHARED=DYLD_FRAMEWORK_PATH=`pwd`${DYLD_FRAMEWORK_PATH:+:${DYLD_FRAMEWORK_PATH}}
   BLDLIBRARY=''
 else
   BLDLIBRARY='$(LDLIBRARY)'
@@ -5348,13 +5348,13 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
     SunOS*)
          LDLIBRARY='libpython$(VERSION).so'
          BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
-         RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+         RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
          INSTSONAME="$LDLIBRARY".$SOVERSION
           ;;
     Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
          LDLIBRARY='libpython$(VERSION).so'
          BLDLIBRARY='-L. -lpython$(VERSION)'
-         RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+         RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
          case $ac_sys_system in
              FreeBSD*)
                SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
@@ -5372,12 +5372,12 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
                        ;;
          esac
          BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
-         RUNSHARED=SHLIB_PATH=`pwd`:${SHLIB_PATH}
+         RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
          ;;
     OSF*)
          LDLIBRARY='libpython$(VERSION).so'
          BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
-         RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+         RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
          ;;
     atheos*)
          LDLIBRARY='libpython$(VERSION).so'
@@ -5387,11 +5387,11 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
     Darwin*)
        LDLIBRARY='libpython$(VERSION).dylib'
        BLDLIBRARY='-L. -lpython$(VERSION)'
-       RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
+       RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
        ;;
     AIX*)
        LDLIBRARY='libpython$(VERSION).so'
-       RUNSHARED=LIBPATH=`pwd`:${LIBPATH}
+       RUNSHARED=LIBPATH=`pwd`${LIBPATH:+:${LIBPATH}}
        ;;
 
   esac

diff --git a/configure.ac b/configure.ac
index f4e93472ded00967dca2ecf7ca23dd6d54618e89..ee7e5fcd07c4e96f1ceb37f5020c4d681c017855 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -860,7 +860,7 @@ AC_MSG_CHECKING(LDLIBRARY)
 if test "$enable_framework"
 then
   LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-  RUNSHARED=DYLD_FRAMEWORK_PATH="`pwd`:$DYLD_FRAMEWORK_PATH"
+  RUNSHARED=DYLD_FRAMEWORK_PATH=`pwd`${DYLD_FRAMEWORK_PATH:+:${DYLD_FRAMEWORK_PATH}}
   BLDLIBRARY=''
 else
   BLDLIBRARY='$(LDLIBRARY)'
@@ -880,13 +880,13 @@ if test $enable_shared = "yes"; then
     SunOS*)
          LDLIBRARY='libpython$(VERSION).so'
          BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
-         RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+         RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
          INSTSONAME="$LDLIBRARY".$SOVERSION
           ;;
     Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
          LDLIBRARY='libpython$(VERSION).so'
          BLDLIBRARY='-L. -lpython$(VERSION)'
-         RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+         RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
          case $ac_sys_system in
              FreeBSD*)
                SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
@@ -904,12 +904,12 @@ if test $enable_shared = "yes"; then
                        ;;
          esac
          BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
-         RUNSHARED=SHLIB_PATH=`pwd`:${SHLIB_PATH}
+         RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
          ;;
     OSF*)
          LDLIBRARY='libpython$(VERSION).so'
          BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
-         RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+         RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
          ;;
     atheos*)
          LDLIBRARY='libpython$(VERSION).so'
@@ -919,11 +919,11 @@ if test $enable_shared = "yes"; then
     Darwin*)
        LDLIBRARY='libpython$(VERSION).dylib'
        BLDLIBRARY='-L. -lpython$(VERSION)'
-       RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
+       RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
        ;;
     AIX*)
        LDLIBRARY='libpython$(VERSION).so'
-       RUNSHARED=LIBPATH=`pwd`:${LIBPATH}
+       RUNSHARED=LIBPATH=`pwd`${LIBPATH:+:${LIBPATH}}
        ;;
 
   esac