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 04:44:42 +02:00
parent 024c5eecbc
commit 8577e5ae09
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

@ -38,6 +38,8 @@ Library
Tests Tests
----- -----
- Issue #17752: Fix distutils tests when run from the installed location.
- Issue #20946: Correct alignment assumptions of some ctypes tests. - Issue #20946: Correct alignment assumptions of some ctypes tests.
- Issue #20939: Fix test_geturl failure in test_urllibnet due to - Issue #20939: Fix test_geturl failure in test_urllibnet due to

12
configure vendored
View File

@ -5576,7 +5576,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)'
@ -5595,7 +5595,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
@ -5605,7 +5605,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`
@ -5627,16 +5627,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

@ -909,7 +909,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)'
@ -926,7 +926,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
@ -936,7 +936,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`
@ -958,16 +958,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