* update gpgme to 1.16.0-3
This commit is contained in:
parent
7864ff8234
commit
15c33a4d3e
@ -4,31 +4,34 @@
|
||||
# Contributor: Sarah Hay <sarah@archlinux.org>
|
||||
|
||||
pkgbase=gpgme
|
||||
pkgname=(gpgme python-gpgme)
|
||||
pkgname=(gpgme qgpgme python-gpgme)
|
||||
pkgver=1.16.0
|
||||
pkgrel=1
|
||||
_python_ver=3.9
|
||||
pkgrel=3
|
||||
_python_ver=3.10
|
||||
pkgdesc="A C wrapper library for GnuPG"
|
||||
arch=(x86_64 powerpc64le powerpc riscv64)
|
||||
url='https://www.gnupg.org/related_software/gpgme/'
|
||||
license=('LGPL')
|
||||
makedepends=('libgpg-error' 'gnupg' 'python' 'swig')
|
||||
makedepends=('libgpg-error' 'gnupg' 'qt5-base' 'python' 'swig')
|
||||
validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020)
|
||||
source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
|
||||
https://github.com/i386x/gpgme/commit/ed9939afc0bc1ef6a0a2dccaae62f19bc30b363d.patch)
|
||||
python310.patch
|
||||
gpgme-1.16.0-glibc-2.34.patch)
|
||||
sha256sums=('6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0'
|
||||
'SKIP'
|
||||
'SKIP')
|
||||
'5de2f6bcb6b30642d0cbc3fbd86803c9460d732f44a526f44cedee8bb78d291a'
|
||||
'c14b19ad01531bcbf9a8083809aca6e1550409e31279f214bd95663888b29a14')
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
patch -Np1 -i ${srcdir}/ed9939afc0bc1ef6a0a2dccaae62f19bc30b363d.patch
|
||||
cd ${pkgbase}-${pkgver}
|
||||
patch -Np1 -i ../python310.patch
|
||||
|
||||
patch -Np1 -i ../gpgme-1.16.0-glibc-2.34.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${pkgbase}-${pkgver}
|
||||
|
||||
export PYTHONHASHSEED=0
|
||||
./configure \
|
||||
--build=${CHOST} \
|
||||
--prefix=/usr \
|
||||
@ -37,11 +40,12 @@ build() {
|
||||
--disable-gpgsm-test
|
||||
make
|
||||
|
||||
# ensure reproducibility of .pyc files
|
||||
_arch=x86_64
|
||||
[ "${CARCH}" = "powerpc" ] && _arch=ppc
|
||||
[ "${CARCH}" = "powerpc64le" ] && _arch=ppc64le
|
||||
[ "${CARCH}" = "riscv64" ] && _arch=riscv64
|
||||
|
||||
# ensure reproducibility of .pyc files
|
||||
touch -d @$SOURCE_DATE_EPOCH lang/python/version.py
|
||||
touch -d @$SOURCE_DATE_EPOCH lang/python/python${_python_ver}-gpg/lib.linux-${_arch}-${_python_ver}/gpg/gpgme.py
|
||||
|
||||
@ -72,9 +76,9 @@ package_gpgme() {
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
# split qgpgme
|
||||
rm -rf "${pkgdir}"/usr/include/{qgpgme,QGpgME}/
|
||||
rm -rf "${pkgdir}"/usr/lib/{cmake/QGpgme/,libqgpgme.*}
|
||||
rm -rf "${pkgdir}"/usr/lib/python*
|
||||
rm -r "${pkgdir}"/usr/include/{qgpgme,QGpgME}/
|
||||
rm -r "${pkgdir}"/usr/lib/{cmake/QGpgme/,libqgpgme.*}
|
||||
rm -r "${pkgdir}"/usr/lib/python*
|
||||
}
|
||||
|
||||
package_qgpgme() {
|
||||
|
33
gpgme/gpgme-1.16.0-glibc-2.34.patch
Normal file
33
gpgme/gpgme-1.16.0-glibc-2.34.patch
Normal file
@ -0,0 +1,33 @@
|
||||
https://bugs.gentoo.org/803557
|
||||
https://dev.gnupg.org/T5587
|
||||
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 5 Sep 2021 00:05:00 +0200
|
||||
Subject: [PATCH] src/posix-io.c: fix build with glibc >= 2.34
|
||||
|
||||
Fix the following build failure with glibc >= 2.34 raised because
|
||||
closefrom doesn't return an int but a void since its addition with
|
||||
https://github.com/bminor/glibc/commit/607449506f197cc9514408908f41f22537a47a8c
|
||||
|
||||
```
|
||||
posix-io.c: In function '_gpgme_io_spawn':
|
||||
posix-io.c:577:23: error: void value not ignored as it ought to be
|
||||
577 | while ((i = closefrom (fd)) && errno == EINTR)
|
||||
| ^
|
||||
```
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/b11094ddd35263071b7dd453a6590c5b684026ff
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
--- a/src/posix-io.c
|
||||
+++ b/src/posix-io.c
|
||||
@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
|
||||
if (fd_list[i].fd > fd)
|
||||
fd = fd_list[i].fd;
|
||||
fd++;
|
||||
-#if defined(__sun) || defined(__FreeBSD__)
|
||||
+#if defined(__sun) || defined(__FreeBSD__) || (defined (__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 34)
|
||||
closefrom (fd);
|
||||
max_fds = fd;
|
||||
#else /*!__sun */
|
332
gpgme/python310.patch
Normal file
332
gpgme/python310.patch
Normal file
@ -0,0 +1,332 @@
|
||||
diff -upr gpgme-1.16.0.orig/configure gpgme-1.16.0/configure
|
||||
--- gpgme-1.16.0.orig/configure 2021-06-24 20:10:50.000000000 +0300
|
||||
+++ gpgme-1.16.0/configure 2021-12-01 00:12:24.383952330 +0200
|
||||
@@ -19625,7 +19625,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -19666,7 +19666,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -19875,7 +19875,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -19933,7 +19933,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -20255,7 +20255,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -20296,7 +20296,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -20505,7 +20505,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -20563,7 +20563,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -20885,7 +20885,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -20926,7 +20926,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -21135,7 +21135,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -21193,7 +21193,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -21515,7 +21515,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -21556,7 +21556,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -21765,7 +21765,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -21823,7 +21823,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -22145,7 +22145,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -22186,7 +22186,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -22395,7 +22395,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -22453,7 +22453,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -22775,7 +22775,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -22816,7 +22816,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -23025,7 +23025,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -23083,7 +23083,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -23291,13 +23291,13 @@ $as_echo "$as_me: WARNING:
|
||||
|
||||
if test -n "$PYTHON"; then
|
||||
# If the user set $PYTHON, use it and don't search something else.
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.9" >&5
|
||||
-$as_echo_n "checking whether $PYTHON version is >= 3.9... " >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.10" >&5
|
||||
+$as_echo_n "checking whether $PYTHON version is >= 3.10... " >&6; }
|
||||
prog="import sys
|
||||
# split strings by '.' and convert to numeric. Append some zeros
|
||||
# because we need at least 4 digits for the hex conversion.
|
||||
# map returns an iterator in Python 3.0 and a list in 2.x
|
||||
-minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0]
|
||||
+minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
|
||||
minverhex = 0
|
||||
# xrange is not present in Python 3.0 and range returns an iterator
|
||||
for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
|
||||
@@ -23318,19 +23318,19 @@ fi
|
||||
else
|
||||
# Otherwise, try each interpreter until we find one that satisfies
|
||||
# VERSION.
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.9" >&5
|
||||
-$as_echo_n "checking for a Python interpreter with version >= 3.9... " >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.10" >&5
|
||||
+$as_echo_n "checking for a Python interpreter with version >= 3.10... " >&6; }
|
||||
if ${am_cv_pathless_PYTHON+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
|
||||
- for am_cv_pathless_PYTHON in python3.9 none; do
|
||||
+ for am_cv_pathless_PYTHON in python3.10 none; do
|
||||
test "$am_cv_pathless_PYTHON" = none && break
|
||||
prog="import sys
|
||||
# split strings by '.' and convert to numeric. Append some zeros
|
||||
# because we need at least 4 digits for the hex conversion.
|
||||
# map returns an iterator in Python 3.0 and a list in 2.x
|
||||
-minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0]
|
||||
+minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
|
||||
minverhex = 0
|
||||
# xrange is not present in Python 3.0 and range returns an iterator
|
||||
for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
|
||||
@@ -23405,7 +23405,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -23446,7 +23446,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -23655,7 +23655,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -23713,7 +23713,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -24035,7 +24035,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -24076,7 +24076,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -24285,7 +24285,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -24343,7 +24343,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user