]> git.pld-linux.org Git - packages/python3.git/blame - python3-lib64.patch
projects / packages / python3.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- 3.0 patches
[packages/python3.git] / python3-lib64.patch
CommitLineData
e684db95
AM		 1diff -Nur Python-2.5b2.orig/configure.in Python-2.5b2/configure.in
2--- Python-2.5b2.orig/configure.in 2006-07-06 11:13:35.000000000 +0100
3+++ Python-2.5b2/configure.in 2006-07-12 17:42:51.000000000 +0100
4@@ -503,6 +503,41 @@
5 ;;
6 esac
7
8+AC_SUBST(ARCH)
9+AC_MSG_CHECKING(ARCH)
10+ARCH=`uname -m`
11+case $ARCH in
12+i?86) ARCH=i386;;
13+esac
14+AC_MSG_RESULT($ARCH)
15+
16+AC_SUBST(LIB)
17+AC_MSG_CHECKING(LIB)
18+case $ac_sys_system in
19+Linux*)
20+ # Test if the compiler is 64bit
21+ echo 'int i;' > conftest.$ac_ext
22+ python_cv_cc_64bit_output=no
23+ if AC_TRY_EVAL(ac_compile); then
24+ case `/usr/bin/file conftest.$ac_objext` in
25+ *"ELF 64"*)
26+ python_cv_cc_64bit_output=yes
27+ ;;
28+ esac
29+ fi
30+ rm -rf conftest*
31+ ;;
32+esac
33+
34+case $ARCH:$python_cv_cc_64bit_output in
35+powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
36+ LIB="lib64"
37+ ;;
38+*:*)
39+ LIB="lib"
40+ ;;
41+esac
42+AC_MSG_RESULT($LIB)
43
44 AC_SUBST(LIBRARY)
45 AC_MSG_CHECKING(LIBRARY)
46diff -Nur Python-2.5b2.orig/Include/pythonrun.h Python-2.5b2/Include/pythonrun.h
47--- Python-2.5b2.orig/Include/pythonrun.h 2006-04-03 07:26:32.000000000 +0100
48+++ Python-2.5b2/Include/pythonrun.h 2006-07-12 17:42:51.000000000 +0100
49@@ -107,6 +107,8 @@
50 /* In their own files */
51 PyAPI_FUNC(const char *) Py_GetVersion(void);
52 PyAPI_FUNC(const char *) Py_GetPlatform(void);
53+PyAPI_FUNC(const char *) Py_GetArch(void);
54+PyAPI_FUNC(const char *) Py_GetLib(void);
55 PyAPI_FUNC(const char *) Py_GetCopyright(void);
56 PyAPI_FUNC(const char *) Py_GetCompiler(void);
57 PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
58diff -Nur Python-2.5b2.orig/Lib/distutils/command/install.py Python-2.5b2/Lib/distutils/command/install.py
59--- Python-2.5b2.orig/Lib/distutils/command/install.py 2006-03-27 22:55:21.000000000 +0100
60+++ Python-2.5b2/Lib/distutils/command/install.py 2006-07-12 17:42:51.000000000 +0100
61@@ -19,6 +19,8 @@
62 from distutils.errors import DistutilsOptionError
63 from glob import glob
64
65+libname = sys.lib
66+
67 if sys.version < "2.2":
68 WINDOWS_SCHEME = {
69 'purelib': '$base',
70@@ -39,14 +41,14 @@
71 INSTALL_SCHEMES = {
72 'unix_prefix': {
73 'purelib': '$base/lib/python$py_version_short/site-packages',
74- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
75+ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
76 'headers': '$base/include/python$py_version_short/$dist_name',
77 'scripts': '$base/bin',
78 'data' : '$base',
79 },
80 'unix_home': {
81 'purelib': '$base/lib/python',
82- 'platlib': '$base/lib/python',
83+ 'platlib': '$base/'+libname+'/python',
84 'headers': '$base/include/python/$dist_name',
85 'scripts': '$base/bin',
86 'data' : '$base',
87diff -Nur Python-2.5b2.orig/Lib/distutils/sysconfig.py Python-2.5b2/Lib/distutils/sysconfig.py
88--- Python-2.5b2.orig/Lib/distutils/sysconfig.py 2006-06-27 11:08:25.000000000 +0100
89+++ Python-2.5b2/Lib/distutils/sysconfig.py 2006-07-12 17:42:51.000000000 +0100
90@@ -99,8 +99,12 @@
91 prefix = plat_specific and EXEC_PREFIX or PREFIX
92
93 if os.name == "posix":
94+ if plat_specific:
95+ lib = sys.lib
96+ else:
97+ lib = 'lib'
98 libpython = os.path.join(prefix,
99- "lib", "python" + get_python_version())
100+ lib, "python" + get_python_version())
101 if standard_lib:
102 return libpython
103 else:
104diff -Nur Python-2.5b2.orig/Lib/distutils/tests/test_install.py Python-2.5b2/Lib/distutils/tests/test_install.py
105--- Python-2.5b2.orig/Lib/distutils/tests/test_install.py 2004-06-26 00:02:59.000000000 +0100
106+++ Python-2.5b2/Lib/distutils/tests/test_install.py 2006-07-12 17:42:51.000000000 +0100
107@@ -1,6 +1,6 @@
108 """Tests for distutils.command.install."""
109
110-import os
111+import os,sys
112 import unittest
113
114 from distutils.command.install import install
115@@ -39,8 +39,9 @@
116 self.assertEqual(got, expected)
117
118 libdir = os.path.join(destination, "lib", "python")
119+ platlibdir = os.path.join(destination, sys.lib, "python")
120 check_path(cmd.install_lib, libdir)
121- check_path(cmd.install_platlib, libdir)
122+ check_path(cmd.install_platlib, platlibdir)
123 check_path(cmd.install_purelib, libdir)
124 check_path(cmd.install_headers,
125 os.path.join(destination, "include", "python", "foopkg"))
126diff -Nur Python-2.5b2.orig/Lib/site.py Python-2.5b2/Lib/site.py
127--- Python-2.5b2.orig/Lib/site.py 2006-06-12 09:23:02.000000000 +0100
128+++ Python-2.5b2/Lib/site.py 2006-07-12 17:42:51.000000000 +0100
129@@ -182,12 +182,18 @@
130 sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
131 elif os.sep == '/':
132 sitedirs = [os.path.join(prefix,
133- "lib",
134+ sys.lib,
135 "python" + sys.version[:3],
136 "site-packages"),
137- os.path.join(prefix, "lib", "site-python")]
138+ os.path.join(prefix, sys.lib, "site-python")]
139+ if sys.lib != 'lib':
140+ sitedirs.append(os.path.join(prefix,
141+ 'lib',
142+ "python" + sys.version[:3],
143+ "site-packages"))
144+ sitedirs.append(os.path.join(prefix, 'lib', "site-python"))
145 else:
146- sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
147+ sitedirs = [prefix, os.path.join(prefix, sys.lib, "site-packages")]
148 if sys.platform == 'darwin':
149 # for framework builds *only* we add the standard Apple
150 # locations. Currently only per-user, but /Library and
151diff -Nur Python-2.5b2.orig/Makefile.pre.in Python-2.5b2/Makefile.pre.in
152--- Python-2.5b2.orig/Makefile.pre.in 2006-06-27 16:45:32.000000000 +0100
153+++ Python-2.5b2/Makefile.pre.in 2006-07-12 17:42:51.000000000 +0100
154@@ -75,6 +75,8 @@
155
156 # Machine-dependent subdirectories
157 MACHDEP= @MACHDEP@
158+LIB= @LIB@
159+ARCH= @ARCH@
160
161 # Install prefix for architecture-independent files
162 prefix= @prefix@
163@@ -84,11 +86,11 @@
164
165 # Expanded directories
166 BINDIR= $(exec_prefix)/bin
167-LIBDIR= $(exec_prefix)/lib
168+LIBDIR= $(exec_prefix)/$(LIB)
169 MANDIR= @mandir@
170 INCLUDEDIR= @includedir@
171 CONFINCLUDEDIR= $(exec_prefix)/include
172-SCRIPTDIR= $(prefix)/lib
173+SCRIPTDIR= $(prefix)/$(LIB)
174
175 # Detailed destination directories
176 BINLIBDEST= $(LIBDIR)/python$(VERSION)
177@@ -489,7 +491,7 @@
178 Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H)
179
180 Python/getplatform.o: $(srcdir)/Python/getplatform.c
181- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
182+ $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c
183
184 Python/importdl.o: $(srcdir)/Python/importdl.c
185 $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
186diff -Nur Python-2.5b2.orig/Modules/getpath.c Python-2.5b2/Modules/getpath.c
187--- Python-2.5b2.orig/Modules/getpath.c 2006-07-10 02:18:57.000000000 +0100
188+++ Python-2.5b2/Modules/getpath.c 2006-07-12 17:42:51.000000000 +0100
189@@ -116,9 +116,17 @@
190 #define EXEC_PREFIX PREFIX
191 #endif
192
193+#ifndef LIB_PYTHON
194+#if defined(__x86_64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__powerpc64__) || defined(__s390x__)
195+#define LIB_PYTHON "lib64/python"
196+#else
197+#define LIB_PYTHON "lib/python"
198+#endif
199+#endif
200+
201 #ifndef PYTHONPATH
202-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
203- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
204+#define PYTHONPATH PREFIX "/" LIB_PYTHON VERSION ":" \
205+ EXEC_PREFIX "/" LIB_PYTHON VERSION "/lib-dynload:"
206 #endif
207
208 #ifndef LANDMARK
209@@ -129,7 +137,7 @@
210 static char exec_prefix[MAXPATHLEN+1];
211 static char progpath[MAXPATHLEN+1];
212 static char *module_search_path = NULL;
213-static char lib_python[] = "lib/python" VERSION;
214+static char lib_python[] = LIB_PYTHON VERSION;
215
216 static void
217 reduce(char *dir)
218diff -Nur Python-2.5b2.orig/Python/getplatform.c Python-2.5b2/Python/getplatform.c
219--- Python-2.5b2.orig/Python/getplatform.c 2000-09-02 00:29:29.000000000 +0100
220+++ Python-2.5b2/Python/getplatform.c 2006-07-12 17:42:51.000000000 +0100
221@@ -10,3 +10,23 @@
222 {
223 return PLATFORM;
224 }
225+
226+#ifndef ARCH
227+#define ARCH "unknown"
228+#endif
229+
230+const char *
231+Py_GetArch(void)
232+{
233+ return ARCH;
234+}
235+
236+#ifndef LIB
237+#define LIB "lib"
238+#endif
239+
240+const char *
241+Py_GetLib(void)
242+{
243+ return LIB;
244+}
245diff -Nur Python-2.5b2.orig/Python/sysmodule.c Python-2.5b2/Python/sysmodule.c
246--- Python-2.5b2.orig/Python/sysmodule.c 2006-07-10 22:08:24.000000000 +0100
247+++ Python-2.5b2/Python/sysmodule.c 2006-07-12 17:42:51.000000000 +0100
248@@ -1080,6 +1080,10 @@
249 PyUnicode_FromString(Py_GetCopyright()));
250 SET_SYS_FROM_STRING("platform",
251 PyUnicode_FromString(Py_GetPlatform()));
252+ SET_SYS_FROM_STRING("arch",
253+ PyUnicode_FromString(Py_GetArch()));
254+ SET_SYS_FROM_STRING("lib",
255+ PyUnicode_FromString(Py_GetLib()));
256 SET_SYS_FROM_STRING("executable",
257 PyUnicode_FromString(Py_GetProgramFullPath()));
258 SET_SYS_FROM_STRING("prefix",
259diff -Nur Python-2.5b2.orig/setup.py Python-2.5b2/setup.py
260--- Python-2.5b2.orig/setup.py 2006-06-30 07:18:39.000000000 +0100
261+++ Python-2.5b2/setup.py 2006-07-12 17:45:14.000000000 +0100
262@@ -290,12 +290,12 @@
263 except NameError:
264 have_unicode = 0
265
266+ libname = sys.lib
267 # lib_dirs and inc_dirs are used to search for files;
268 # if a file is found in one of those directories, it can
269 # be assumed that no additional -I,-L directives are needed.
270 lib_dirs = self.compiler.library_dirs + [
271- '/lib64', '/usr/lib64',
272- '/lib', '/usr/lib',
273+ libname, '/usr/'+libname
274 ]
275 inc_dirs = self.compiler.include_dirs + ['/usr/include']
276 exts = []
277@@ -496,11 +496,11 @@
278 elif self.compiler.find_library_file(lib_dirs, 'curses'):
279 readline_libs.append('curses')
280 elif self.compiler.find_library_file(lib_dirs +
281- ['/usr/lib/termcap'],
282+ ['/usr' + libname + '/termcap'],
283 'termcap'):
284 readline_libs.append('termcap')
285 exts.append( Extension('readline', ['readline.c'],
286- library_dirs=['/usr/lib/termcap'],
287+ library_dirs=['/usr' + libname + 'termcap'],
288 extra_link_args=readline_extra_link_args,
289 libraries=readline_libs) )
290 if platform not in ['mac']:
291@@ -1244,8 +1244,8 @@
292 added_lib_dirs.append('/usr/openwin/lib')
293 elif os.path.exists('/usr/X11R6/include'):
294 include_dirs.append('/usr/X11R6/include')
295- added_lib_dirs.append('/usr/X11R6/lib64')
296- added_lib_dirs.append('/usr/X11R6/lib')
297+ added_lib_dirs.append('/usr/X11R6/'+sys.lib)
298+ #added_lib_dirs.append('/usr/X11R6/lib')
299 elif os.path.exists('/usr/X11R5/include'):
300 include_dirs.append('/usr/X11R5/include')
301 added_lib_dirs.append('/usr/X11R5/lib')
Very high level scripting language with X interface
This page took 0.12004 seconds and 4 git commands to generate.