diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-06-09 13:54:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 13:54:54 (GMT) |
| commit | 6cb24a035c5980cab39b6dc5d70762af07293bea (patch) | |
| tree | ddb6889a2956a464206dd24c03b48c79aa4c0a13 | |
| parent | 1a819ca1877cebb79b9a889de497dc638b4cf635 (diff) | |
| download | cpython-6cb24a035c5980cab39b6dc5d70762af07293bea.zip cpython-6cb24a035c5980cab39b6dc5d70762af07293bea.tar.gz cpython-6cb24a035c5980cab39b6dc5d70762af07293bea.tar.bz2 | |
bpo-40684: Fix make install for platlibdir=lib64 (GH-20736)
"make install" now uses the PLATLIBDIR variable for the destination
lib-dynload/ directory when ./configure --with-platlibdir is used.
Update --with-platlibdir comment in configure.
(cherry picked from commit 51ae31e5b93b986e57a7e18e25f981a6ffcdefb7)
Co-authored-by: Victor Stinner <vstinner@python.org>
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Build/2020-06-08-19-57-05.bpo-40684.WIY2-i.rst | 2 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.ac | 7 |
4 files changed, 16 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index a7d5dd2..652efb4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -148,7 +148,7 @@ SCRIPTDIR= $(prefix)/$(PLATLIBDIR) ABIFLAGS= @ABIFLAGS@ # Detailed destination directories -BINLIBDEST= $(LIBDIR)/python$(VERSION) +BINLIBDEST= @BINLIBDEST@ LIBDEST= $(SCRIPTDIR)/python$(VERSION) INCLUDEPY= $(INCLUDEDIR)/python$(LDVERSION) CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) diff --git a/Misc/NEWS.d/next/Build/2020-06-08-19-57-05.bpo-40684.WIY2-i.rst b/Misc/NEWS.d/next/Build/2020-06-08-19-57-05.bpo-40684.WIY2-i.rst new file mode 100644 index 0000000..0495e5e --- /dev/null +++ b/Misc/NEWS.d/next/Build/2020-06-08-19-57-05.bpo-40684.WIY2-i.rst @@ -0,0 +1,2 @@ +``make install`` now uses the ``PLATLIBDIR`` variable for the destination +``lib-dynload/`` directory when ``./configure --with-platlibdir`` is used. @@ -632,6 +632,7 @@ THREADHEADERS LIBPL PY_ENABLE_SHARED PLATLIBDIR +BINLIBDEST LIBPYTHON EXT_SUFFIX ALT_SOABI @@ -15330,7 +15331,11 @@ else fi -# Check for --with-libdir-name + +BINLIBDEST='$(LIBDIR)/python$(VERSION)' + + +# Check for --with-platlibdir # /usr/$LIDIRNAME/python$VERSION PLATLIBDIR="lib" @@ -15349,6 +15354,7 @@ then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } PLATLIBDIR="$withval" + BINLIBDEST='${exec_prefix}/${PLATLIBDIR}/python$(VERSION)' else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } diff --git a/configure.ac b/configure.ac index 2d63198..bb327f6 100644 --- a/configure.ac +++ b/configure.ac @@ -4770,7 +4770,11 @@ else fi -# Check for --with-libdir-name +AC_SUBST(BINLIBDEST) +BINLIBDEST='$(LIBDIR)/python$(VERSION)' + + +# Check for --with-platlibdir # /usr/$LIDIRNAME/python$VERSION AC_SUBST(PLATLIBDIR) PLATLIBDIR="lib" @@ -4787,6 +4791,7 @@ if test -n "$withval" -a "$withval" != yes -a "$withval" != no then AC_MSG_RESULT(yes) PLATLIBDIR="$withval" + BINLIBDEST='${exec_prefix}/${PLATLIBDIR}/python$(VERSION)' else AC_MSG_RESULT(no) fi], |