summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python3/python-3.3-multilib.patch21
1 files changed, 13 insertions, 8 deletions
diff --git a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
index 77da6159c9..cc35dc1617 100644
--- a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
+++ b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
@@ -52,11 +52,13 @@ Index: Python-3.5.4/Lib/distutils/command/install.py
52 WINDOWS_SCHEME = { 52 WINDOWS_SCHEME = {
53 'purelib': '$base/Lib/site-packages', 53 'purelib': '$base/Lib/site-packages',
54 'platlib': '$base/Lib/site-packages', 54 'platlib': '$base/Lib/site-packages',
55@@ -30,7 +32,7 @@ WINDOWS_SCHEME = { 55@@ -29,8 +31,8 @@ WINDOWS_SCHEME = {
56
56 INSTALL_SCHEMES = { 57 INSTALL_SCHEMES = {
57 'unix_prefix': { 58 'unix_prefix': {
58 'purelib': '$base/lib/python$py_version_short/site-packages', 59- 'purelib': '$base/lib/python$py_version_short/site-packages',
59- 'platlib': '$platbase/lib/python$py_version_short/site-packages', 60- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
61+ 'purelib': '$platbase/'+libname+'/python$py_version_short/site-packages',
60+ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages', 62+ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
61 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', 63 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
62 'scripts': '$base/bin', 64 'scripts': '$base/bin',
@@ -103,10 +105,11 @@ Index: Python-3.5.4/Lib/sysconfig.py
103 'posix_prefix': { 105 'posix_prefix': {
104- 'stdlib': '{installed_base}/lib/python{py_version_short}', 106- 'stdlib': '{installed_base}/lib/python{py_version_short}',
105- 'platstdlib': '{platbase}/lib/python{py_version_short}', 107- 'platstdlib': '{platbase}/lib/python{py_version_short}',
108- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
109- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
106+ 'stdlib': '{installed_base}/'+sys.lib+'/python{py_version_short}', 110+ 'stdlib': '{installed_base}/'+sys.lib+'/python{py_version_short}',
107+ 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', 111+ 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}',
108 'purelib': '{base}/lib/python{py_version_short}/site-packages', 112+ 'purelib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages',
109- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
110+ 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', 113+ 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages',
111 'include': 114 'include':
112 '{installed_base}/include/python{py_version_short}{abiflags}', 115 '{installed_base}/include/python{py_version_short}{abiflags}',
@@ -117,10 +120,11 @@ Index: Python-3.5.4/Lib/sysconfig.py
117 'posix_home': { 120 'posix_home': {
118- 'stdlib': '{installed_base}/lib/python', 121- 'stdlib': '{installed_base}/lib/python',
119- 'platstdlib': '{base}/lib/python', 122- 'platstdlib': '{base}/lib/python',
123- 'purelib': '{base}/lib/python',
124- 'platlib': '{base}/lib/python',
120+ 'stdlib': '{installed_base}/'+sys.lib+'/python', 125+ 'stdlib': '{installed_base}/'+sys.lib+'/python',
121+ 'platstdlib': '{base}/'+sys.lib+'/python', 126+ 'platstdlib': '{base}/'+sys.lib+'/python',
122 'purelib': '{base}/lib/python', 127+ 'purelib': '{base}/'+sys.lib+'/python',
123- 'platlib': '{base}/lib/python',
124+ 'platlib': '{base}/'+sys.lib+'/python', 128+ 'platlib': '{base}/'+sys.lib+'/python',
125 'include': '{installed_base}/include/python', 129 'include': '{installed_base}/include/python',
126 'platinclude': '{installed_base}/include/python', 130 'platinclude': '{installed_base}/include/python',
@@ -131,10 +135,11 @@ Index: Python-3.5.4/Lib/sysconfig.py
131 'posix_user': { 135 'posix_user': {
132- 'stdlib': '{userbase}/lib/python{py_version_short}', 136- 'stdlib': '{userbase}/lib/python{py_version_short}',
133- 'platstdlib': '{userbase}/lib/python{py_version_short}', 137- 'platstdlib': '{userbase}/lib/python{py_version_short}',
138- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
139- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
134+ 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', 140+ 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
135+ 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', 141+ 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
136 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', 142+ 'purelib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages',
137- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
138+ 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', 143+ 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages',
139 'include': '{userbase}/include/python{py_version_short}', 144 'include': '{userbase}/include/python{py_version_short}',
140 'scripts': '{userbase}/bin', 145 'scripts': '{userbase}/bin',