python-2.5.2-lib64.patch 13.8 KB
Newer Older
1
http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/python/current/SOURCES/
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
diff -Naur Python-2.5.2.orig/configure Python-2.5.2/configure
--- Python-2.5.2.orig/configure	2008-12-04 12:53:20.850370886 +0100
+++ Python-2.5.2/configure	2008-12-04 12:56:26.041364487 +0100
@@ -685,6 +685,8 @@
 GREP
 EGREP
 BUILDEXEEXT
+ARCH
+LIB
 LIBRARY
 LDLIBRARY
 DLLLIBRARY
@@ -3833,6 +3835,49 @@
 esac
 
 
+{ echo "$as_me:$LINENO: checking ARCH" >&5
+echo $ECHO_N "checking ARCH... $ECHO_C" >&6; }
+ARCH=`uname -m`
+case $ARCH in
+i?86) ARCH=i386;;
+esac
+{ echo "$as_me:$LINENO: result: $ARCH" >&5
+echo "${ECHO_T}$ARCH" >&6; }
+
+
+{ echo "$as_me:$LINENO: checking LIB" >&5
+echo $ECHO_N "checking LIB... $ECHO_C" >&6; }
+case $ac_sys_system in
+Linux*)
+  # Test if the compiler is 64bit
+  echo 'int i;' > conftest.$ac_ext
+  python_cv_cc_64bit_output=no
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *"ELF 64"*)
+      python_cv_cc_64bit_output=yes
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+case $ARCH:$python_cv_cc_64bit_output in
+ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+  LIB="lib64"
+  ;;
+*:*)
+  LIB="lib"
+  ;;
+esac
+{ echo "$as_me:$LINENO: result: $LIB" >&5
+echo "${ECHO_T}$LIB" >&6; }
+
 
 { echo "$as_me:$LINENO: checking LIBRARY" >&5
 echo $ECHO_N "checking LIBRARY... $ECHO_C" >&6; }
@@ -23367,6 +23412,8 @@
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 BUILDEXEEXT!$BUILDEXEEXT$ac_delim
+ARCH!$ARCH$ac_delim
+LIB!$LIB$ac_delim
 LIBRARY!$LIBRARY$ac_delim
 LDLIBRARY!$LDLIBRARY$ac_delim
 DLLLIBRARY!$DLLLIBRARY$ac_delim
@@ -23393,8 +23440,6 @@
 LINKFORSHARED!$LINKFORSHARED$ac_delim
 CFLAGSFORSHARED!$CFLAGSFORSHARED$ac_delim
 SHLIBS!$SHLIBS$ac_delim
-USE_SIGNAL_MODULE!$USE_SIGNAL_MODULE$ac_delim
-SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -23436,6 +23481,8 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+USE_SIGNAL_MODULE!$USE_SIGNAL_MODULE$ac_delim
+SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim
 USE_THREAD_MODULE!$USE_THREAD_MODULE$ac_delim
 LDLAST!$LDLAST$ac_delim
 THREADOBJ!$THREADOBJ$ac_delim
@@ -23457,7 +23504,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -Naur Python-2.5.2.orig/configure.in Python-2.5.2/configure.in
--- Python-2.5.2.orig/configure.in	2008-12-04 12:53:22.283369893 +0100
+++ Python-2.5.2/configure.in	2008-12-04 12:54:55.362364592 +0100
@@ -513,6 +513,41 @@
     ;;
 esac
 
+AC_SUBST(ARCH)
+AC_MSG_CHECKING(ARCH)
+ARCH=`uname -m`
+case $ARCH in
+i?86) ARCH=i386;;
+esac
+AC_MSG_RESULT($ARCH)
+
+AC_SUBST(LIB)
+AC_MSG_CHECKING(LIB)
+case $ac_sys_system in
+Linux*)
+  # Test if the compiler is 64bit
+  echo 'int i;' > conftest.$ac_ext
+  python_cv_cc_64bit_output=no
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *"ELF 64"*)
+      python_cv_cc_64bit_output=yes
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+case $ARCH:$python_cv_cc_64bit_output in
+ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+  LIB="lib64"
+  ;;
+*:*)
+  LIB="lib"
+  ;;
+esac
+AC_MSG_RESULT($LIB)
 
 AC_SUBST(LIBRARY)
 AC_MSG_CHECKING(LIBRARY)
diff -Naur Python-2.5.2.orig/Include/pythonrun.h Python-2.5.2/Include/pythonrun.h
--- Python-2.5.2.orig/Include/pythonrun.h	2008-12-04 12:53:23.384369909 +0100
+++ Python-2.5.2/Include/pythonrun.h	2008-12-04 12:54:55.366365660 +0100
@@ -107,6 +107,8 @@
150 151 152 153 154 155 156 157
 /* In their own files */
 PyAPI_FUNC(const char *) Py_GetVersion(void);
 PyAPI_FUNC(const char *) Py_GetPlatform(void);
+PyAPI_FUNC(const char *) Py_GetArch(void);
+PyAPI_FUNC(const char *) Py_GetLib(void);
 PyAPI_FUNC(const char *) Py_GetCopyright(void);
 PyAPI_FUNC(const char *) Py_GetCompiler(void);
 PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
158 159 160 161
diff -Naur Python-2.5.2.orig/Lib/distutils/command/install.py Python-2.5.2/Lib/distutils/command/install.py
--- Python-2.5.2.orig/Lib/distutils/command/install.py	2008-12-04 12:53:20.869369116 +0100
+++ Python-2.5.2/Lib/distutils/command/install.py	2008-12-04 12:54:55.365365533 +0100
@@ -19,6 +19,8 @@
162 163 164 165 166 167 168 169
 from distutils.errors import DistutilsOptionError
 from glob import glob
 
+libname = sys.lib
+
 if sys.version < "2.2":
     WINDOWS_SCHEME = {
         'purelib': '$base',
170
@@ -39,14 +41,14 @@
171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186
 INSTALL_SCHEMES = {
     'unix_prefix': {
         'purelib': '$base/lib/python$py_version_short/site-packages',
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
+        'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
         'headers': '$base/include/python$py_version_short/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
         },
     'unix_home': {
         'purelib': '$base/lib/python',
-        'platlib': '$base/lib/python',
+        'platlib': '$base/'+libname+'/python',
         'headers': '$base/include/python/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
187 188 189 190
diff -Naur Python-2.5.2.orig/Lib/distutils/sysconfig.py Python-2.5.2/Lib/distutils/sysconfig.py
--- Python-2.5.2.orig/Lib/distutils/sysconfig.py	2008-12-04 12:53:20.868368429 +0100
+++ Python-2.5.2/Lib/distutils/sysconfig.py	2008-12-04 12:54:55.364364847 +0100
@@ -99,8 +99,12 @@
191 192 193 194 195 196 197 198 199 200 201 202 203
         prefix = plat_specific and EXEC_PREFIX or PREFIX
 
     if os.name == "posix":
+        if plat_specific:
+            lib = sys.lib
+        else:
+            lib = 'lib'
         libpython = os.path.join(prefix,
-                                 "lib", "python" + get_python_version())
+                                 lib, "python" + get_python_version())
         if standard_lib:
             return libpython
         else:
204 205 206
diff -Naur Python-2.5.2.orig/Lib/distutils/tests/test_install.py Python-2.5.2/Lib/distutils/tests/test_install.py
--- Python-2.5.2.orig/Lib/distutils/tests/test_install.py	2008-12-04 12:53:20.870370919 +0100
+++ Python-2.5.2/Lib/distutils/tests/test_install.py	2008-12-04 12:54:55.365365533 +0100
207 208 209 210 211 212 213 214
@@ -1,6 +1,6 @@
 """Tests for distutils.command.install."""
 
-import os
+import os,sys
 import unittest
 
 from distutils.command.install import install
215
@@ -39,8 +39,9 @@
216 217 218 219 220 221 222 223 224 225
             self.assertEqual(got, expected)
 
         libdir = os.path.join(destination, "lib", "python")
+        platlibdir =  os.path.join(destination, sys.lib, "python")
         check_path(cmd.install_lib, libdir)
-        check_path(cmd.install_platlib, libdir)
+        check_path(cmd.install_platlib, platlibdir)
         check_path(cmd.install_purelib, libdir)
         check_path(cmd.install_headers,
                    os.path.join(destination, "include", "python", "foopkg"))
226 227 228 229
diff -Naur Python-2.5.2.orig/Lib/site.py Python-2.5.2/Lib/site.py
--- Python-2.5.2.orig/Lib/site.py	2008-12-04 12:53:20.861370890 +0100
+++ Python-2.5.2/Lib/site.py	2008-12-04 12:54:55.364364847 +0100
@@ -182,12 +182,18 @@
230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250
                 sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
             elif os.sep == '/':
                 sitedirs = [os.path.join(prefix,
-                                         "lib",
+                                         sys.lib,
                                          "python" + sys.version[:3],
                                          "site-packages"),
-                            os.path.join(prefix, "lib", "site-python")]
+                            os.path.join(prefix, sys.lib, "site-python")]
+                if sys.lib != 'lib':
+                    sitedirs.append(os.path.join(prefix,
+                                                 'lib',
+                                                 "python" + sys.version[:3],
+                                                 "site-packages"))
+                    sitedirs.append(os.path.join(prefix, 'lib', "site-python"))
             else:
-                sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
+                sitedirs = [prefix, os.path.join(prefix, sys.lib, "site-packages")]
             if sys.platform == 'darwin':
                 # for framework builds *only* we add the standard Apple
                 # locations. Currently only per-user, but /Library and
251 252 253 254
diff -Naur Python-2.5.2.orig/Makefile.pre.in Python-2.5.2/Makefile.pre.in
--- Python-2.5.2.orig/Makefile.pre.in	2008-12-04 12:53:22.283369893 +0100
+++ Python-2.5.2/Makefile.pre.in	2008-12-04 12:54:55.353367357 +0100
@@ -75,6 +75,8 @@
255 256 257 258 259 260 261 262
 
 # Machine-dependent subdirectories
 MACHDEP=	@MACHDEP@
+LIB=		@LIB@
+ARCH=		@ARCH@
 
 # Install prefix for architecture-independent files
 prefix=		@prefix@
263
@@ -87,11 +89,11 @@
264 265 266 267 268 269 270 271 272 273 274 275 276
 
 # Expanded directories
 BINDIR=		$(exec_prefix)/bin
-LIBDIR=		$(exec_prefix)/lib
+LIBDIR=		$(exec_prefix)/$(LIB)
 MANDIR=		@mandir@
 INCLUDEDIR=	@includedir@
 CONFINCLUDEDIR=	$(exec_prefix)/include
-SCRIPTDIR=	$(prefix)/lib
+SCRIPTDIR=	$(prefix)/$(LIB)
 
 # Detailed destination directories
 BINLIBDEST=	$(LIBDIR)/python$(VERSION)
277 278
@@ -495,7 +497,7 @@
 Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H)
279 280 281 282 283 284 285
 
 Python/getplatform.o: $(srcdir)/Python/getplatform.c
-		$(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
+		$(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c
 
 Python/importdl.o: $(srcdir)/Python/importdl.c
 		$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
286 287 288 289
diff -Naur Python-2.5.2.orig/Modules/getpath.c Python-2.5.2/Modules/getpath.c
--- Python-2.5.2.orig/Modules/getpath.c	2008-12-04 12:53:23.369370512 +0100
+++ Python-2.5.2/Modules/getpath.c	2008-12-04 12:54:55.364364847 +0100
@@ -116,9 +116,17 @@
290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308
 #define EXEC_PREFIX PREFIX
 #endif
 
+#ifndef LIB_PYTHON
+#if defined(__x86_64__) || defined(__powerpc64__)
+#define LIB_PYTHON "lib64/python" VERSION
+#else
+#define LIB_PYTHON "lib/python" VERSION
+#endif
+#endif
+
 #ifndef PYTHONPATH
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
+              EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
 #endif
 
 #ifndef LANDMARK
309
@@ -129,7 +137,7 @@
310 311 312 313 314 315 316 317
 static char exec_prefix[MAXPATHLEN+1];
 static char progpath[MAXPATHLEN+1];
 static char *module_search_path = NULL;
-static char lib_python[] = "lib/python" VERSION;
+static char lib_python[] = LIB_PYTHON;
 
 static void
 reduce(char *dir)
318 319 320 321
diff -Naur Python-2.5.2.orig/Python/getplatform.c Python-2.5.2/Python/getplatform.c
--- Python-2.5.2.orig/Python/getplatform.c	2008-12-04 12:53:23.173370128 +0100
+++ Python-2.5.2/Python/getplatform.c	2008-12-04 12:54:55.365365533 +0100
@@ -10,3 +10,23 @@
322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344
 {
 	return PLATFORM;
 }
+
+#ifndef ARCH
+#define ARCH "unknown"
+#endif
+
+const char *
+Py_GetArch(void)
+{
+	return ARCH;
+}
+
+#ifndef LIB
+#define LIB "lib"
+#endif
+
+const char *
+Py_GetLib(void)
+{
+	return LIB;
+}
345 346 347 348
diff -Naur Python-2.5.2.orig/Python/sysmodule.c Python-2.5.2/Python/sysmodule.c
--- Python-2.5.2.orig/Python/sysmodule.c	2008-12-04 12:53:23.175368986 +0100
+++ Python-2.5.2/Python/sysmodule.c	2008-12-04 12:54:55.366365660 +0100
@@ -1159,6 +1159,10 @@
349 350 351 352 353 354 355 356 357 358
 			    PyString_FromString(Py_GetPlatform()));
 	SET_SYS_FROM_STRING("executable",
 			    PyString_FromString(Py_GetProgramFullPath()));
+	SET_SYS_FROM_STRING("arch",
+			    PyString_FromString(Py_GetArch()));
+	SET_SYS_FROM_STRING("lib",
+			    PyString_FromString(Py_GetLib()));
 	SET_SYS_FROM_STRING("prefix",
 			    PyString_FromString(Py_GetPrefix()));
 	SET_SYS_FROM_STRING("exec_prefix",
359 360 361 362
diff -Naur Python-2.5.2.orig/setup.py Python-2.5.2/setup.py
--- Python-2.5.2.orig/setup.py	2008-12-04 12:53:22.286366085 +0100
+++ Python-2.5.2/setup.py	2008-12-04 12:54:55.363365837 +0100
@@ -291,12 +291,12 @@
363 364 365 366 367 368 369 370 371 372 373 374 375 376
         except NameError:
             have_unicode = 0
 
+        libname = sys.lib
         # lib_dirs and inc_dirs are used to search for files;
         # if a file is found in one of those directories, it can
         # be assumed that no additional -I,-L directives are needed.
         lib_dirs = self.compiler.library_dirs + [
-            '/lib64', '/usr/lib64',
-            '/lib', '/usr/lib',
+            libname, '/usr/'+libname
             ]
         inc_dirs = self.compiler.include_dirs + ['/usr/include']
         exts = []
377
@@ -497,11 +497,11 @@
378 379 380 381 382 383 384 385 386 387 388 389 390
             elif self.compiler.find_library_file(lib_dirs, 'curses'):
                 readline_libs.append('curses')
             elif self.compiler.find_library_file(lib_dirs +
-                                               ['/usr/lib/termcap'],
+                                               ['/usr/'+libname+'/termcap'],
                                                'termcap'):
                 readline_libs.append('termcap')
             exts.append( Extension('readline', ['readline.c'],
-                                   library_dirs=['/usr/lib/termcap'],
+                                   library_dirs=['/usr/'+libname+'/termcap'],
                                    extra_link_args=readline_extra_link_args,
                                    libraries=readline_libs) )
         if platform not in ['mac']:
391
@@ -1267,8 +1267,8 @@
392 393 394 395 396 397 398 399 400 401
             added_lib_dirs.append('/usr/openwin/lib')
         elif os.path.exists('/usr/X11R6/include'):
             include_dirs.append('/usr/X11R6/include')
-            added_lib_dirs.append('/usr/X11R6/lib64')
-            added_lib_dirs.append('/usr/X11R6/lib')
+            added_lib_dirs.append('/usr/X11R6/'+sys.lib)
+            #added_lib_dirs.append('/usr/X11R6/lib')
         elif os.path.exists('/usr/X11R5/include'):
             include_dirs.append('/usr/X11R5/include')
             added_lib_dirs.append('/usr/X11R5/lib')