Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
doko@ubuntu.com 2014-05-07 13:08:51 +02:00
parent 5915505796 e5de66eaa7
commit 4ce74dc54c
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/distutils/tests/support.py
View File

@ -207,4 +207,4 @@ def fixup_build_ext(cmd):
cmd.library_dirs = [] cmd.library_dirs = []
else: else:
name, equals, value = runshared.partition('=') 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]

2
Misc/NEWS
View File

@ -403,6 +403,8 @@ Documentation
Tests Tests
----- -----
- Issue #17752: Fix distutils tests when run from the installed location.
- Issue #18604: Consolidated checks for GUI availability. All platforms now - Issue #18604: Consolidated checks for GUI availability. All platforms now
at least check whether Tk can be instantiated when the GUI resource is at least check whether Tk can be instantiated when the GUI resource is
requested. requested.

12
configure vendored
View File

@ -5606,7 +5606,7 @@ $as_echo_n "checking LDLIBRARY... " >&6; }
if test "$enable_framework" if test "$enable_framework"
then then
LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' 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='' BLDLIBRARY=''
else else
BLDLIBRARY='$(LDLIBRARY)' BLDLIBRARY='$(LDLIBRARY)'
@ -5626,7 +5626,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
SunOS*) SunOS*)
LDLIBRARY='libpython$(LDVERSION).so' LDLIBRARY='libpython$(LDVERSION).so'
BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)' BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
INSTSONAME="$LDLIBRARY".$SOVERSION INSTSONAME="$LDLIBRARY".$SOVERSION
if test "$with_pydebug" != yes if test "$with_pydebug" != yes
then then
@ -5636,7 +5636,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
LDLIBRARY='libpython$(LDVERSION).so' LDLIBRARY='libpython$(LDVERSION).so'
BLDLIBRARY='-L. -lpython$(LDVERSION)' BLDLIBRARY='-L. -lpython$(LDVERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
case $ac_sys_system in case $ac_sys_system in
FreeBSD*) FreeBSD*)
SOVERSION=`echo $SOVERSION|cut -d "." -f 1` SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
@ -5658,16 +5658,16 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
;; ;;
esac esac
BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)' BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
RUNSHARED=SHLIB_PATH=`pwd`:${SHLIB_PATH} RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
;; ;;
Darwin*) Darwin*)
LDLIBRARY='libpython$(LDVERSION).dylib' LDLIBRARY='libpython$(LDVERSION).dylib'
BLDLIBRARY='-L. -lpython$(LDVERSION)' BLDLIBRARY='-L. -lpython$(LDVERSION)'
RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}' RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
;; ;;
AIX*) AIX*)
LDLIBRARY='libpython$(LDVERSION).so' LDLIBRARY='libpython$(LDVERSION).so'
RUNSHARED=LIBPATH=`pwd`:${LIBPATH} RUNSHARED=LIBPATH=`pwd`${LIBPATH:+:${LIBPATH}}
;; ;;
esac esac

12
configure.ac
View File

@ -928,7 +928,7 @@ AC_MSG_CHECKING(LDLIBRARY)
if test "$enable_framework" if test "$enable_framework"
then then
LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' 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='' BLDLIBRARY=''
else else
BLDLIBRARY='$(LDLIBRARY)' BLDLIBRARY='$(LDLIBRARY)'
@ -946,7 +946,7 @@ if test $enable_shared = "yes"; then
SunOS*) SunOS*)
LDLIBRARY='libpython$(LDVERSION).so' LDLIBRARY='libpython$(LDVERSION).so'
BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)' BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
INSTSONAME="$LDLIBRARY".$SOVERSION INSTSONAME="$LDLIBRARY".$SOVERSION
if test "$with_pydebug" != yes if test "$with_pydebug" != yes
then then
@ -956,7 +956,7 @@ if test $enable_shared = "yes"; then
Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
LDLIBRARY='libpython$(LDVERSION).so' LDLIBRARY='libpython$(LDVERSION).so'
BLDLIBRARY='-L. -lpython$(LDVERSION)' BLDLIBRARY='-L. -lpython$(LDVERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
case $ac_sys_system in case $ac_sys_system in
FreeBSD*) FreeBSD*)
SOVERSION=`echo $SOVERSION|cut -d "." -f 1` SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
@ -978,16 +978,16 @@ if test $enable_shared = "yes"; then
;; ;;
esac esac
BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)' BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
RUNSHARED=SHLIB_PATH=`pwd`:${SHLIB_PATH} RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
;; ;;
Darwin*) Darwin*)
LDLIBRARY='libpython$(LDVERSION).dylib' LDLIBRARY='libpython$(LDVERSION).dylib'
BLDLIBRARY='-L. -lpython$(LDVERSION)' BLDLIBRARY='-L. -lpython$(LDVERSION)'
RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}' RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
;; ;;
AIX*) AIX*)
LDLIBRARY='libpython$(LDVERSION).so' LDLIBRARY='libpython$(LDVERSION).so'
RUNSHARED=LIBPATH=`pwd`:${LIBPATH} RUNSHARED=LIBPATH=`pwd`${LIBPATH:+:${LIBPATH}}
;; ;;
esac esac