04c9ed3700
* add libb2 as dep * remove "-Wl,--large-address-aware", default now via makepkg * remove 2to3 logic, no longer in Python
63 lines
2.9 KiB
Diff
63 lines
2.9 KiB
Diff
From 0200c7781a3171328d8ab4f3fd157511fb73956e Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Tue, 21 Sep 2021 20:53:59 +0200
|
|
Subject: [PATCH 023/N] sysconfig: mingw sysconfig like posix
|
|
|
|
---
|
|
Lib/sysconfig/__init__.py | 28 ++++++++++++++--------------
|
|
1 file changed, 14 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
|
|
index 59690a0..9a42867 100644
|
|
--- a/Lib/sysconfig/__init__.py
|
|
+++ b/Lib/sysconfig/__init__.py
|
|
@@ -49,13 +49,13 @@ _INSTALL_SCHEMES = {
|
|
'data': '{base}',
|
|
},
|
|
'nt': {
|
|
- 'stdlib': '{installed_base}/Lib',
|
|
- 'platstdlib': '{base}/Lib',
|
|
- 'purelib': '{base}/Lib/site-packages',
|
|
- 'platlib': '{base}/Lib/site-packages',
|
|
- 'include': '{installed_base}/Include',
|
|
- 'platinclude': '{installed_base}/Include',
|
|
- 'scripts': '{base}/Scripts',
|
|
+ 'stdlib': '{installed_base}/lib/python{py_version_short}',
|
|
+ 'platstdlib': '{base}/lib/python{py_version_short}',
|
|
+ 'purelib': '{base}/lib/python{py_version_short}/site-packages',
|
|
+ 'platlib': '{base}/lib/python{py_version_short}/site-packages',
|
|
+ 'include': '{installed_base}/include/python{py_version_short}',
|
|
+ 'platinclude': '{installed_base}/include/python{py_version_short}',
|
|
+ 'scripts': '{base}/bin',
|
|
'data': '{base}',
|
|
},
|
|
|
|
@@ -143,12 +143,12 @@ if _HAS_USER_BASE:
|
|
_INSTALL_SCHEMES |= {
|
|
# NOTE: When modifying "purelib" scheme, update site._get_path() too.
|
|
'nt_user': {
|
|
- 'stdlib': '{userbase}/{implementation}{py_version_nodot_plat}',
|
|
- 'platstdlib': '{userbase}/{implementation}{py_version_nodot_plat}',
|
|
- 'purelib': '{userbase}/{implementation}{py_version_nodot_plat}/site-packages',
|
|
- 'platlib': '{userbase}/{implementation}{py_version_nodot_plat}/site-packages',
|
|
- 'include': '{userbase}/{implementation}{py_version_nodot_plat}/Include',
|
|
- 'scripts': '{userbase}/{implementation}{py_version_nodot_plat}/Scripts',
|
|
+ 'stdlib': '{userbase}/lib/python{py_version_short}',
|
|
+ 'platstdlib': '{userbase}/lib/python{py_version_short}',
|
|
+ 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
|
|
+ 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
|
|
+ 'include': '{userbase}/include/python{py_version_short}',
|
|
+ 'scripts': '{userbase}/bin',
|
|
'data': '{userbase}',
|
|
},
|
|
'posix_user': {
|
|
@@ -384,7 +384,7 @@ def _init_non_posix(vars):
|
|
vars['LIBRARY'] = os.path.basename(_safe_realpath(dllhandle))
|
|
vars['LDLIBRARY'] = vars['LIBRARY']
|
|
vars['EXE'] = '.exe'
|
|
- vars['VERSION'] = _PY_VERSION_SHORT_NO_DOT
|
|
+ vars['VERSION'] = _PY_VERSION_SHORT
|
|
vars['BINDIR'] = os.path.dirname(_safe_realpath(sys.executable))
|
|
vars['TZPATH'] = ''
|
|
|