Fix python3-config --configdir

00205-make-libpl-respect-lib64.patch only modified LIBPL in
Makefile.pre.in which leads to an inconsistency in
python3-config --configdir which uses the unmodified LIBPL (use
/usr/lib instead of /usr/lib64).

00102-lib64.patch now updates LIBPL in configure.ac instead, as it is
done in Python 3.8 patch. Remove
00205-make-libpl-respect-lib64.patch.

Resolves: rhbz#1772988
This commit is contained in:
Victor Stinner 2020-05-28 02:58:33 +02:00
commit e01caf2f03
3 changed files with 20 additions and 19 deletions

View file

@ -200,3 +200,19 @@ index 0f2dfc4..da37896 100644
] )
if (ssl_incs is not None and
diff --git a/configure.ac b/configure.ac
index 01c66fe..1e6d515 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4772,9 +4772,9 @@ AC_MSG_RESULT($LDVERSION)
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
AC_SUBST(PY_ENABLE_SHARED)
if test x$PLATFORM_TRIPLET = x; then
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
else
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
fi
AC_SUBST(LIBPL)