python: don't build with PY_COERCE_C_LOCALE

This is a Unix only feature
This commit is contained in:
Christoph Reiter
2020-10-01 09:39:24 +02:00
parent 68056a4acd
commit eb34cc2bc8
2 changed files with 2 additions and 34 deletions

View File

@@ -1,30 +0,0 @@
diff -Naur Python-3.8.0-orig/Python/pylifecycle.c Python-3.8.0/Python/pylifecycle.c
--- Python-3.8.0-orig/Python/pylifecycle.c 2019-10-22 10:04:47.230741200 +0300
+++ Python-3.8.0/Python/pylifecycle.c 2019-10-22 10:04:56.918358300 +0300
@@ -47,6 +47,26 @@
#define PyWindowsConsoleIO_Check(op) (PyObject_TypeCheck((op), &PyWindowsConsoleIO_Type))
#endif
+#if defined(__MINGW32__) && defined(PY_COERCE_C_LOCALE)
+static int
+setenv (const char *var, const char *val, int ovr)
+{
+ BOOL b;
+ char c[2];
+ if (!ovr)
+ {
+ DWORD d;
+ d = GetEnvironmentVariableA (var, c, 2);
+ if (0 != d && GetLastError () != ERROR_ENVVAR_NOT_FOUND)
+ return 1;
+ }
+ b = SetEnvironmentVariableA (var, val);
+ if (b)
+ return 0;
+ return 1;
+}
+#endif
+
_Py_IDENTIFIER(flush);
_Py_IDENTIFIER(name);
_Py_IDENTIFIER(stdin);

View File

@@ -18,7 +18,7 @@ pkgbase="mingw-w64-${_realname}"
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
_pybasever=3.8
pkgver=${_pybasever}.6
pkgrel=1
pkgrel=2
provides=("${MINGW_PACKAGE_PREFIX}-python3=${pkgver}")
conflicts=("${MINGW_PACKAGE_PREFIX}-python3"
"${MINGW_PACKAGE_PREFIX}-python2<2.7.16-7")
@@ -119,7 +119,6 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
1701-disable-broken-gdbm-module.patch
1800-link-win-resource-files-and-build-pythonw.patch
1810-3.7-mpdec-mingw.patch
1830-mingw-implement-setenv-for-PY_COERCE_C_LOCALE.patch
1850-disable-readline.patch
1860-fix-isselectable.patch
1870-use-_wcsnicmp-instead-wcsncasecmp.patch
@@ -281,7 +280,6 @@ prepare() {
apply_patch_with_msg \
1810-3.7-mpdec-mingw.patch \
1830-mingw-implement-setenv-for-PY_COERCE_C_LOCALE.patch \
1850-disable-readline.patch \
1860-fix-isselectable.patch \
1870-use-_wcsnicmp-instead-wcsncasecmp.patch \
@@ -397,6 +395,7 @@ build() {
--with-system-ffi \
--with-system-libmpdec \
--without-ensurepip \
--without-c-locale-coercion \
--enable-loadable-sqlite-extensions \
"${_extra_config[@]}" \
OPT=""
@@ -553,7 +552,6 @@ sha256sums=('a9e0b79d27aa056eb9cce8d63a427b5f9bab1465dee3f942dcfdb25a82f4ab8a'
'551047905350e113384f99e0e929e9381dc0a4ed514ca4ebe279dcdad798edce'
'1da319664d39427156488b9b39ff39e33c53ef608f66319fdf9fb9bcdb29020d'
'fc6164a90f0ca2a9341aaf4448b4334c3393459ca5cbad6d7149f8bcf70da5fe'
'8f917063fe5e662ffe11d6e782d5828c41ec54a04b90693db9b5df4280e9ade5'
'181672743d9e2449064a1b18764fa400af5d3cd268098e7b7e5069d0b128caa2'
'6f2032347bb40e2ebe9b3a03062147ffa2f656d47c87821623c3b7d46dc15ddb'
'c4670070e546317295071350872e1a00918fd3284609620f84beb44ed54c1ebd'