forked from freddix/python3
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathpython3-lib64.patch
More file actions
187 lines (178 loc) · 8.35 KB
/
python3-lib64.patch
File metadata and controls
187 lines (178 loc) · 8.35 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
diff -aurN Python-3.3.2.orig/Lib/distutils/command/install.py Python-3.3.2/Lib/distutils/command/install.py
--- Python-3.3.2.orig/Lib/distutils/command/install.py 2013-08-02 10:07:05.378371271 +0200
+++ Python-3.3.2/Lib/distutils/command/install.py 2013-08-02 10:07:26.360212825 +0200
@@ -45,14 +45,14 @@
INSTALL_SCHEMES = {
'unix_prefix': {
'purelib': '$base/lib/python$py_version_short/site-packages',
- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
},
'unix_home': {
'purelib': '$base/lib/python',
- 'platlib': '$base/lib/python',
+ 'platlib': '$base/lib64/python',
'headers': '$base/include/python/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
diff -aurN Python-3.3.2.orig/Lib/distutils/sysconfig.py Python-3.3.2/Lib/distutils/sysconfig.py
--- Python-3.3.2.orig/Lib/distutils/sysconfig.py 2013-08-02 10:07:05.376371191 +0200
+++ Python-3.3.2/Lib/distutils/sysconfig.py 2013-08-02 10:07:26.360212825 +0200
@@ -143,8 +143,12 @@
prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
+ if plat_specific or standard_lib:
+ lib = "lib64"
+ else:
+ lib = "lib"
libpython = os.path.join(prefix,
- "lib", "python" + get_python_version())
+ lib, "python" + get_python_version())
if standard_lib:
return libpython
else:
diff -aurN Python-3.3.2.orig/Lib/site.py Python-3.3.2/Lib/site.py
--- Python-3.3.2.orig/Lib/site.py 2013-08-02 10:07:05.372371031 +0200
+++ Python-3.3.2/Lib/site.py 2013-08-02 10:07:26.360212825 +0200
@@ -303,12 +303,16 @@
if sys.platform in ('os2emx', 'riscos'):
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
elif os.sep == '/':
+ sitepackages.append(os.path.join(prefix, "lib64",
+ "python" + sys.version[:3],
+ "site-packages"))
sitepackages.append(os.path.join(prefix, "lib",
"python" + sys.version[:3],
"site-packages"))
sitepackages.append(os.path.join(prefix, "lib", "site-python"))
else:
sitepackages.append(prefix)
+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
diff -aurN Python-3.3.2.orig/Lib/sysconfig.py Python-3.3.2/Lib/sysconfig.py
--- Python-3.3.2.orig/Lib/sysconfig.py 2013-08-02 10:07:05.378371271 +0200
+++ Python-3.3.2/Lib/sysconfig.py 2013-08-02 10:07:26.360212825 +0200
@@ -21,10 +21,10 @@
_INSTALL_SCHEMES = {
'posix_prefix': {
- 'stdlib': '{installed_base}/lib/python{py_version_short}',
- 'platstdlib': '{platbase}/lib/python{py_version_short}',
+ 'stdlib': '{installed_base}/lib64/python{py_version_short}',
+ 'platstdlib': '{platbase}/lib64/python{py_version_short}',
'purelib': '{base}/lib/python{py_version_short}/site-packages',
- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
'include':
'{installed_base}/include/python{py_version_short}{abiflags}',
'platinclude':
@@ -33,10 +33,10 @@
'data': '{base}',
},
'posix_home': {
- 'stdlib': '{installed_base}/lib/python',
- 'platstdlib': '{base}/lib/python',
+ 'stdlib': '{installed_base}/lib64/python',
+ 'platstdlib': '{base}/lib64/python',
'purelib': '{base}/lib/python',
- 'platlib': '{base}/lib/python',
+ 'platlib': '{base}/lib64/python',
'include': '{installed_base}/include/python',
'platinclude': '{installed_base}/include/python',
'scripts': '{base}/bin',
@@ -81,10 +81,10 @@
'data': '{userbase}',
},
'posix_user': {
- 'stdlib': '{userbase}/lib/python{py_version_short}',
- 'platstdlib': '{userbase}/lib/python{py_version_short}',
+ 'stdlib': '{userbase}/lib64/python{py_version_short}',
+ 'platstdlib': '{userbase}/lib64/python{py_version_short}',
'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
'include': '{userbase}/include/python{py_version_short}',
'scripts': '{userbase}/bin',
'data': '{userbase}',
diff -aurN Python-3.3.2.orig/Makefile.pre.in Python-3.3.2/Makefile.pre.in
--- Python-3.3.2.orig/Makefile.pre.in 2013-08-02 10:07:05.339369707 +0200
+++ Python-3.3.2/Makefile.pre.in 2013-08-02 10:21:36.792384672 +0200
@@ -1177,7 +1177,7 @@
# Install the library and miscellaneous stuff needed for extending/embedding
# This goes into $(exec_prefix)
-LIBPL= $(LIBDEST)/config-$(LDVERSION)
+LIBPL= $(BINLIBDEST)/config-$(LDVERSION)
# pkgconfig directory
LIBPC= $(LIBDIR)/pkgconfig
diff -aurN Python-3.3.2.orig/Modules/getpath.c Python-3.3.2/Modules/getpath.c
--- Python-3.3.2.orig/Modules/getpath.c 2013-08-02 10:07:05.363370670 +0200
+++ Python-3.3.2/Modules/getpath.c 2013-08-02 10:07:26.361212865 +0200
@@ -123,7 +123,7 @@
#ifndef PYTHONPATH
#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
#endif
#ifndef LANDMARK
@@ -136,6 +136,7 @@
static wchar_t *module_search_path = NULL;
static int module_search_path_malloced = 0;
static wchar_t *lib_python = L"lib/python" VERSION;
+static wchar_t *lib64_python = L"lib64/python" VERSION;
static void
reduce(wchar_t *dir)
@@ -391,7 +392,7 @@
wcsncpy(exec_prefix, delim+1, MAXPATHLEN);
else
wcsncpy(exec_prefix, home, MAXPATHLEN);
- joinpath(exec_prefix, lib_python);
+ joinpath(exec_prefix, lib64_python);
joinpath(exec_prefix, L"lib-dynload");
return 1;
}
@@ -432,7 +433,7 @@
copy_absolute(exec_prefix, argv0_path, MAXPATHLEN+1);
do {
n = wcslen(exec_prefix);
- joinpath(exec_prefix, lib_python);
+ joinpath(exec_prefix, lib64_python);
joinpath(exec_prefix, L"lib-dynload");
if (isdir(exec_prefix))
return 1;
@@ -442,7 +443,7 @@
/* Look at configure's EXEC_PREFIX */
wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
- joinpath(exec_prefix, lib_python);
+ joinpath(exec_prefix, lib64_python);
joinpath(exec_prefix, L"lib-dynload");
if (isdir(exec_prefix))
return 1;
@@ -687,7 +688,7 @@
fprintf(stderr,
"Could not find platform dependent libraries <exec_prefix>\n");
wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
- joinpath(exec_prefix, L"lib/lib-dynload");
+ joinpath(exec_prefix, L"lib64/lib-dynload");
}
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
diff -aurN Python-3.3.2.orig/setup.py Python-3.3.2/setup.py
--- Python-3.3.2.orig/setup.py 2013-08-02 10:07:05.407372435 +0200
+++ Python-3.3.2/setup.py 2013-08-02 10:10:13.610945524 +0200
@@ -712,11 +712,11 @@
elif curses_library:
readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
- ['/usr/lib/termcap'],
+ ['/usr/lib64/termcap'],
'termcap'):
readline_libs.append('termcap')
exts.append( Extension('readline', ['readline.c'],
- library_dirs=['/usr/lib/termcap'],
+ library_dirs=['/usr/lib64/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else: