|
 |
f1a8d26 |
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
|
|
|
3e0514b |
index ed44a93..1af2240 100644
|
|
|
f1a8d26 |
--- a/Lib/distutils/command/install.py
|
|
|
f1a8d26 |
+++ b/Lib/distutils/command/install.py
|
|
|
3e0514b |
@@ -36,9 +36,9 @@ INSTALL_SCHEMES = {
|
|
|
3e0514b |
'data' : '$base',
|
|
|
3e0514b |
},
|
|
|
3e0514b |
'unix_home': {
|
|
|
3e0514b |
- 'purelib': '$base/lib/python',
|
|
|
3e0514b |
- 'platlib': '$base/lib64/python',
|
|
|
3e0514b |
- 'headers': '$base/include/python/$dist_name',
|
|
|
3e0514b |
+ 'purelib': '$base/lib/platform-python',
|
|
|
3e0514b |
+ 'platlib': '$base/lib64/platform-python',
|
|
|
3e0514b |
+ 'headers': '$base/include/platform-python/$dist_name',
|
|
|
f1a8d26 |
'scripts': '$base/bin',
|
|
|
f1a8d26 |
'data' : '$base',
|
|
|
f1a8d26 |
},
|
|
|
f1a8d26 |
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
|
|
|
3e0514b |
index 240bb66..57cebae 100644
|
|
|
f1a8d26 |
--- a/Lib/sysconfig.py
|
|
|
f1a8d26 |
+++ b/Lib/sysconfig.py
|
|
|
3e0514b |
@@ -32,12 +32,12 @@ _INSTALL_SCHEMES = {
|
|
|
f1a8d26 |
'data': '{base}',
|
|
|
f1a8d26 |
},
|
|
|
3e0514b |
'posix_home': {
|
|
|
3e0514b |
- 'stdlib': '{installed_base}/lib/python',
|
|
|
3e0514b |
- 'platstdlib': '{base}/lib/python',
|
|
|
3e0514b |
- 'purelib': '{base}/lib/python',
|
|
|
3e0514b |
- 'platlib': '{base}/lib/python',
|
|
|
3e0514b |
- 'include': '{installed_base}/include/python',
|
|
|
3e0514b |
- 'platinclude': '{installed_base}/include/python',
|
|
|
3e0514b |
+ 'stdlib': '{installed_base}/lib/platform-python',
|
|
|
3e0514b |
+ 'platstdlib': '{base}/lib/platform-python',
|
|
|
3e0514b |
+ 'purelib': '{base}/lib/platform-python',
|
|
|
3e0514b |
+ 'platlib': '{base}/lib/platform-python',
|
|
|
3e0514b |
+ 'include': '{installed_base}/include/platform-python',
|
|
|
3e0514b |
+ 'platinclude': '{installed_base}/include/platform-python',
|
|
|
3e0514b |
'scripts': '{base}/bin',
|
|
|
3e0514b |
'data': '{base}',
|
|
|
f1a8d26 |
},
|
|
|
f1a8d26 |
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
|
3e0514b |
index 4f8c042..cd30d06 100644
|
|
|
f1a8d26 |
--- a/Makefile.pre.in
|
|
|
f1a8d26 |
+++ b/Makefile.pre.in
|
|
|
3e0514b |
@@ -1449,7 +1449,7 @@ frameworkinstallstructure: $(LDLIBRARY)
|
|
|
3e0514b |
else true; \
|
|
 |
deb8056 |
fi; \
|
|
|
deb8056 |
done
|
|
|
3e0514b |
- $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
|
|
|
3e0514b |
+ $(LN) -fsn include/platform-python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
|
|
|
3e0514b |
sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
|
|
|
3e0514b |
$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
|
|
|
3e0514b |
$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
|
|
|
3e0514b |
diff --git a/Misc/python-config.in b/Misc/python-config.in
|
|
|
3e0514b |
index e13da75..a72893c 100644
|
|
|
3e0514b |
--- a/Misc/python-config.in
|
|
|
3e0514b |
+++ b/Misc/python-config.in
|
|
|
3e0514b |
@@ -47,7 +47,7 @@ for opt in opt_flags:
|
|
|
3e0514b |
print(' '.join(flags))
|
|
|
f1a8d26 |
|
|
|
3e0514b |
elif opt in ('--libs', '--ldflags'):
|
|
|
3e0514b |
- libs = ['-lpython' + pyver + sys.abiflags]
|
|
|
3e0514b |
+ libs = ['-lplatform-python' + pyver + sys.abiflags]
|
|
|
3e0514b |
libs += getvar('LIBS').split()
|
|
|
3e0514b |
libs += getvar('SYSLIBS').split()
|
|
|
3e0514b |
# add the prefix/lib/pythonX.Y/config dir, but only if there is no
|
|
|
3e0514b |
diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
|
|
|
3e0514b |
index 30c6927..d62425b 100644
|
|
|
3e0514b |
--- a/Misc/python-config.sh.in
|
|
|
3e0514b |
+++ b/Misc/python-config.sh.in
|
|
|
3e0514b |
@@ -40,19 +40,19 @@ LIBM="@LIBM@"
|
|
|
3e0514b |
LIBC="@LIBC@"
|
|
|
3e0514b |
SYSLIBS="$LIBM $LIBC"
|
|
|
3e0514b |
ABIFLAGS="@ABIFLAGS@"
|
|
|
3e0514b |
-LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS"
|
|
|
3e0514b |
+LIBS="-lplatform-python${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS"
|
|
|
3e0514b |
BASECFLAGS="@BASECFLAGS@"
|
|
|
3e0514b |
LDLIBRARY="@LDLIBRARY@"
|
|
|
3e0514b |
LINKFORSHARED="@LINKFORSHARED@"
|
|
|
3e0514b |
OPT="@OPT@"
|
|
|
3e0514b |
PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
|
|
|
3e0514b |
LDVERSION="@LDVERSION@"
|
|
|
3e0514b |
-LIBDEST=${prefix}/lib/python${VERSION}
|
|
|
3e0514b |
+LIBDEST=${prefix}/lib/platform-python${VERSION}
|
|
|
3e0514b |
LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
|
|
|
3e0514b |
SO="@EXT_SUFFIX@"
|
|
|
3e0514b |
PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
|
|
|
3e0514b |
-INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"
|
|
|
3e0514b |
-PLATINCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"
|
|
|
3e0514b |
+INCDIR="-I$includedir/platform-python${VERSION}${ABIFLAGS}"
|
|
|
3e0514b |
+PLATINCDIR="-I$includedir/platform-python${VERSION}${ABIFLAGS}"
|
|
|
3e0514b |
|
|
|
3e0514b |
# Scan for --help or unknown argument.
|
|
|
3e0514b |
for ARG in $*
|
|
|
3e0514b |
diff --git a/Misc/python.pc.in b/Misc/python.pc.in
|
|
|
3e0514b |
index ae69867..38405a1 100644
|
|
|
3e0514b |
--- a/Misc/python.pc.in
|
|
|
3e0514b |
+++ b/Misc/python.pc.in
|
|
|
3e0514b |
@@ -9,5 +9,5 @@ Description: Python library
|
|
|
3e0514b |
Requires:
|
|
|
3e0514b |
Version: @VERSION@
|
|
|
3e0514b |
Libs.private: @LIBS@
|
|
|
3e0514b |
-Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@
|
|
|
3e0514b |
-Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@
|
|
|
3e0514b |
+Libs: -L${libdir} -lplatform-python@VERSION@@ABIFLAGS@
|
|
|
3e0514b |
+Cflags: -I${includedir}/platform-python@VERSION@@ABIFLAGS@
|
|
|
3e0514b |
diff --git a/Modules/makesetup b/Modules/makesetup
|
|
|
3e0514b |
index 8db8de8..430e323 100755
|
|
|
3e0514b |
--- a/Modules/makesetup
|
|
|
3e0514b |
+++ b/Modules/makesetup
|
|
|
3e0514b |
@@ -92,7 +92,7 @@ CYGWIN*) if test $libdir = .
|
|
|
3e0514b |
else
|
|
|
3e0514b |
ExtraLibDir='$(LIBPL)'
|
|
|
3e0514b |
fi
|
|
|
3e0514b |
- ExtraLibs="-L$ExtraLibDir -lpython\$(VERSION)";;
|
|
|
3e0514b |
+ ExtraLibs="-L$ExtraLibDir -lplatform-python\$(VERSION)";;
|
|
|
3e0514b |
esac
|
|
|
3e0514b |
|
|
|
3e0514b |
# Main loop
|
|
|
f1a8d26 |
diff --git a/configure b/configure
|
|
|
3e0514b |
index eea17a4..0cdf419 100755
|
|
|
f1a8d26 |
--- a/configure
|
|
|
f1a8d26 |
+++ b/configure
|
|
|
3e0514b |
@@ -5962,7 +5962,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
|
|
|
f1a8d26 |
;;
|
|
|
3e0514b |
SunOS*)
|
|
|
3e0514b |
LDLIBRARY='libpython$(LDVERSION).so'
|
|
|
3e0514b |
- BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
|
|
|
3e0514b |
+ BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lplatform-python$(LDVERSION)'
|
|
|
f1a8d26 |
RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
|
|
f1a8d26 |
INSTSONAME="$LDLIBRARY".$SOVERSION
|
|
|
f1a8d26 |
if test "$with_pydebug" != yes
|
|
|
3e0514b |
@@ -5989,12 +5989,12 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
|
|
|
3e0514b |
LDLIBRARY='libpython$(LDVERSION).sl'
|
|
|
3e0514b |
;;
|
|
|
3e0514b |
esac
|
|
|
3e0514b |
- BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
|
|
|
3e0514b |
+ BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lplatform-python$(LDVERSION)'
|
|
|
3e0514b |
RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
|
|
|
f1a8d26 |
;;
|
|
|
3e0514b |
Darwin*)
|
|
|
3e0514b |
LDLIBRARY='libpython$(LDVERSION).dylib'
|
|
|
3e0514b |
- BLDLIBRARY='-L. -lpython$(LDVERSION)'
|
|
|
3e0514b |
+ BLDLIBRARY='-L. -lplatform-python$(LDVERSION)'
|
|
|
3e0514b |
RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
|
|
|
3e0514b |
;;
|
|
|
3e0514b |
AIX*)
|
|
|
3e0514b |
@@ -15060,9 +15060,9 @@ $as_echo "$LDVERSION" >&6; }
|
|
|
3e0514b |
|
|
|
3e0514b |
|
|
|
3e0514b |
if test x$PLATFORM_TRIPLET = x; then
|
|
|
3e0514b |
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
|
|
|
3e0514b |
+ LIBPL='$(prefix)'"/lib/platform-python${VERSION}/config-${LDVERSION}"
|
|
|
3e0514b |
else
|
|
|
3e0514b |
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
|
|
|
3e0514b |
+ LIBPL='$(prefix)'"/lib/platform-python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
|
|
|
3e0514b |
fi
|
|
|
3e0514b |
|
|
|
3e0514b |
|
|
|
f1a8d26 |
diff --git a/configure.ac b/configure.ac
|
|
|
3e0514b |
index 74b0e57..f20b54e 100644
|
|
|
f1a8d26 |
--- a/configure.ac
|
|
|
f1a8d26 |
+++ b/configure.ac
|
|
|
3e0514b |
@@ -1139,7 +1139,7 @@ if test $enable_shared = "yes"; then
|
|
|
3e0514b |
;;
|
|
|
3e0514b |
SunOS*)
|
|
|
3e0514b |
LDLIBRARY='libpython$(LDVERSION).so'
|
|
|
3e0514b |
- BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
|
|
|
3e0514b |
+ BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lplatform-python$(LDVERSION)'
|
|
|
3e0514b |
RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
|
|
3e0514b |
INSTSONAME="$LDLIBRARY".$SOVERSION
|
|
|
3e0514b |
if test "$with_pydebug" != yes
|
|
|
f1a8d26 |
@@ -1148,13 +1148,13 @@ if test $enable_shared = "yes"; then
|
|
|
f1a8d26 |
fi
|
|
|
f1a8d26 |
;;
|
|
|
f1a8d26 |
Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
|
|
|
f1a8d26 |
- LDLIBRARY='libpython$(LDVERSION).so'
|
|
|
3e0514b |
- BLDLIBRARY='-L. -lpython$(LDVERSION)'
|
|
|
deb8056 |
+ LDLIBRARY='libplatform-python$(LDVERSION).so'
|
|
|
3e0514b |
+ BLDLIBRARY='-L. -lplatform-python$(LDVERSION)'
|
|
|
f1a8d26 |
RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
|
|
f1a8d26 |
INSTSONAME="$LDLIBRARY".$SOVERSION
|
|
|
f1a8d26 |
if test "$with_pydebug" != yes
|
|
|
f1a8d26 |
then
|
|
|
f1a8d26 |
- PY3LIBRARY=libpython3.so
|
|
|
deb8056 |
+ PY3LIBRARY=libplatform-python3.so
|
|
|
f1a8d26 |
fi
|
|
|
f1a8d26 |
;;
|
|
|
f1a8d26 |
hp*|HP*)
|
|
|
3e0514b |
@@ -1166,12 +1166,12 @@ if test $enable_shared = "yes"; then
|
|
|
3e0514b |
LDLIBRARY='libpython$(LDVERSION).sl'
|
|
|
3e0514b |
;;
|
|
|
3e0514b |
esac
|
|
|
3e0514b |
- BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
|
|
|
3e0514b |
+ BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lplatform-python$(LDVERSION)'
|
|
|
3e0514b |
RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
|
|
|
3e0514b |
;;
|
|
|
3e0514b |
Darwin*)
|
|
|
3e0514b |
- LDLIBRARY='libpython$(LDVERSION).dylib'
|
|
|
3e0514b |
- BLDLIBRARY='-L. -lpython$(LDVERSION)'
|
|
|
3e0514b |
+ LDLIBRARY='libplatform-ython$(LDVERSION).dylib'
|
|
|
3e0514b |
+ BLDLIBRARY='-L. -lplatform-python$(LDVERSION)'
|
|
|
3e0514b |
RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
|
|
|
3e0514b |
;;
|
|
|
3e0514b |
AIX*)
|
|
|
3e0514b |
@@ -4691,9 +4691,9 @@ AC_MSG_RESULT($LDVERSION)
|
|
|
3e0514b |
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
|
|
|
3e0514b |
AC_SUBST(PY_ENABLE_SHARED)
|
|
|
3e0514b |
if test x$PLATFORM_TRIPLET = x; then
|
|
|
3e0514b |
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
|
|
|
3e0514b |
+ LIBPL='$(prefix)'"/lib/platform-python${VERSION}/config-${LDVERSION}"
|
|
|
3e0514b |
else
|
|
|
3e0514b |
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
|
|
|
3e0514b |
+ LIBPL='$(prefix)'"/lib/platform-python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
|
|
|
3e0514b |
fi
|
|
|
3e0514b |
AC_SUBST(LIBPL)
|
|
|
3e0514b |
|