[packages/python.git] / python-lib64.patch

diff -Nur Python-2.4.orig/Lib/distutils/command/install.py Python-2.4/Lib/distutils/command/install.py
--- Python-2.4.orig/Lib/distutils/command/install.py	2004-12-23 09:49:49.805802000 +0000
+++ Python-2.4/Lib/distutils/command/install.py	2004-12-23 09:50:42.787747736 +0000
@@ -39,14 +39,14 @@
 INSTALL_SCHEMES = {
     'unix_prefix': {
         'purelib': '$base/share/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/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
         },
     'unix_home': {
         'purelib': '$base/share/python',
-        'platlib': '$base/lib/python',
+        'platlib': '$base/lib64/python',
         'headers': '$base/include/python/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
diff -Nur Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/sysconfig.py
--- Python-2.4.orig/Lib/distutils/sysconfig.py	2004-12-23 09:49:49.806802000 +0000
+++ Python-2.4/Lib/distutils/sysconfig.py	2004-12-23 09:50:42.788747584 +0000
@@ -101,7 +101,7 @@
     if os.name == "posix":
         if plat_specific: 
             libpython = os.path.join(prefix,
-                                 "lib", "python" + get_python_version())
+                                 "lib64", "python" + get_python_version())
         else:
             libpython = os.path.join(prefix,
                                  "share", "python" + get_python_version())
diff -Nur Python-2.4.orig/Lib/site.py Python-2.4/Lib/site.py
--- Python-2.4.orig/Lib/site.py	2004-12-23 09:49:49.807801000 +0000
+++ Python-2.4/Lib/site.py	2004-12-23 09:52:09.563555808 +0000
@@ -179,10 +179,10 @@
                 sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
             elif os.sep == '/':
                 sitedirs = [os.path.join(prefix,
-                                         "lib",
+                                         "lib64",
                                          "python" + sys.version[:3],
                                          "site-packages"),
-		            os.path.join(prefix, "lib", "site-python"),
+		            os.path.join(prefix, "lib64", "site-python"),
 			    os.path.join(prefix,
                                          "share",
                                          "python" + sys.version[:3],
@@ -190,7 +190,7 @@
 			    os.path.join(prefix, "share", "site-python")]
 
             else:
-                sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
+                sitedirs = [prefix, os.path.join(prefix, "lib64", "site-packages")]
             if sys.platform == 'darwin':
                 # for framework builds *only* we add the standard Apple
                 # locations. Currently only per-user, but /Library and
diff -Nur Python-2.4.orig/Makefile.pre.in Python-2.4/Makefile.pre.in
--- Python-2.4.orig/Makefile.pre.in	2004-12-23 09:49:49.806802000 +0000
+++ Python-2.4/Makefile.pre.in	2004-12-23 09:50:42.789747432 +0000
@@ -79,7 +79,7 @@
 
 # Expanded directories
 BINDIR=		$(exec_prefix)/bin
-LIBDIR=		$(exec_prefix)/lib
+LIBDIR=		$(exec_prefix)/lib64
 MANDIR=		@mandir@
 INCLUDEDIR=	@includedir@
 CONFINCLUDEDIR=	$(exec_prefix)/include
diff -Nur Python-2.4.orig/Modules/getpath.c Python-2.4/Modules/getpath.c
--- Python-2.4.orig/Modules/getpath.c	2004-12-23 09:49:49.807801000 +0000
+++ Python-2.4/Modules/getpath.c	2004-12-23 09:50:42.790747280 +0000
@@ -113,7 +113,7 @@
 
 #ifndef PYTHONPATH
 #define PYTHONPATH PREFIX "/share/python" VERSION ":" \
-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
+              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
 #endif
 
 #ifndef LANDMARK
@@ -124,7 +124,7 @@
 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[] = "lib64/python" VERSION;
 static char share_python[] = "share/python" VERSION;
 
 static void
@@ -516,7 +516,7 @@
     }
     else
         strncpy(zip_path, PREFIX, MAXPATHLEN);
-    joinpath(zip_path, "lib/python00.zip");
+    joinpath(zip_path, "lib64/python00.zip");
     bufsz = strlen(zip_path);	/* Replace "00" with version */
     zip_path[bufsz - 6] = VERSION[0];
     zip_path[bufsz - 5] = VERSION[2];
diff -Nur Python-2.4.orig/setup.py Python-2.4/setup.py
--- Python-2.4.orig/setup.py	2004-12-23 09:49:49.798803000 +0000
+++ Python-2.4/setup.py	2004-12-23 09:56:00.934382096 +0000
@@ -239,7 +239,7 @@
 
     def detect_modules(self):
         # Ensure that /usr/local is always used
-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
 
         # Add paths to popular package managers on OS X/darwin
Commit	Line	Data
837202b7	1	diff -Nur Python-2.4.orig/Lib/distutils/command/install.py Python-2.4/Lib/distutils/command/install.py
	2	--- Python-2.4.orig/Lib/distutils/command/install.py 2004-12-23 09:49:49.805802000 +0000
	3	+++ Python-2.4/Lib/distutils/command/install.py 2004-12-23 09:50:42.787747736 +0000
35445076	4	@@ -39,14 +39,14 @@
16835136 JK	5	INSTALL_SCHEMES = {
16835136 JK	6	'unix_prefix': {
35445076	7	'purelib': '$base/share/python$py_version_short/site-packages',
16835136	8	- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
16835136 JK	9	+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
	10	'headers': '$base/include/python$py_version_short/$dist_name',
	11	'scripts': '$base/bin',
	12	'data' : '$base',
	13	},
	14	'unix_home': {
35445076	15	'purelib': '$base/share/python',
16835136	16	- 'platlib': '$base/lib/python',
16835136 JK	17	+ 'platlib': '$base/lib64/python',
	18	'headers': '$base/include/python/$dist_name',
	19	'scripts': '$base/bin',
	20	'data' : '$base',
837202b7	21	diff -Nur Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/sysconfig.py
	22	--- Python-2.4.orig/Lib/distutils/sysconfig.py 2004-12-23 09:49:49.806802000 +0000
	23	+++ Python-2.4/Lib/distutils/sysconfig.py 2004-12-23 09:50:42.788747584 +0000
0e38d5e0	24	@@ -101,7 +101,7 @@
54029e24	25	if os.name == "posix":
633d5774	26	if plat_specific:
0e38d5e0	27	libpython = os.path.join(prefix,
54029e24 JK	28	- "lib", "python" + get_python_version())
54029e24 JK	29	+ "lib64", "python" + get_python_version())
633d5774	30	else:
0e38d5e0 JK	31	libpython = os.path.join(prefix,
0e38d5e0 JK	32	"share", "python" + get_python_version())
837202b7	33	diff -Nur Python-2.4.orig/Lib/site.py Python-2.4/Lib/site.py
	34	--- Python-2.4.orig/Lib/site.py 2004-12-23 09:49:49.807801000 +0000
	35	+++ Python-2.4/Lib/site.py 2004-12-23 09:52:09.563555808 +0000
	36	@@ -179,10 +179,10 @@
	37	sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
	38	elif os.sep == '/':
	39	sitedirs = [os.path.join(prefix,
	40	- "lib",
	41	+ "lib64",
	42	"python" + sys.version[:3],
	43	"site-packages"),
	44	- os.path.join(prefix, "lib", "site-python"),
	45	+ os.path.join(prefix, "lib64", "site-python"),
	46	os.path.join(prefix,
	47	"share",
	48	"python" + sys.version[:3],
	49	@@ -190,7 +190,7 @@
	50	os.path.join(prefix, "share", "site-python")]
	51
	52	else:
	53	- sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
	54	+ sitedirs = [prefix, os.path.join(prefix, "lib64", "site-packages")]
	55	if sys.platform == 'darwin':
	56	# for framework builds only we add the standard Apple
	57	# locations. Currently only per-user, but /Library and
	58	diff -Nur Python-2.4.orig/Makefile.pre.in Python-2.4/Makefile.pre.in
	59	--- Python-2.4.orig/Makefile.pre.in 2004-12-23 09:49:49.806802000 +0000
	60	+++ Python-2.4/Makefile.pre.in 2004-12-23 09:50:42.789747432 +0000
5d2233b0	61	@@ -79,7 +79,7 @@
16835136 JK	62
	63	# Expanded directories
	64	BINDIR= $(exec_prefix)/bin
	65	-LIBDIR= $(exec_prefix)/lib
	66	+LIBDIR= $(exec_prefix)/lib64
	67	MANDIR= @mandir@
	68	INCLUDEDIR= @includedir@
	69	CONFINCLUDEDIR= $(exec_prefix)/include
837202b7	70	diff -Nur Python-2.4.orig/Modules/getpath.c Python-2.4/Modules/getpath.c
	71	--- Python-2.4.orig/Modules/getpath.c 2004-12-23 09:49:49.807801000 +0000
	72	+++ Python-2.4/Modules/getpath.c 2004-12-23 09:50:42.790747280 +0000
2db2a190	73	@@ -113,7 +113,7 @@
16835136 JK	74
16835136 JK	75	#ifndef PYTHONPATH
2db2a190	76	#define PYTHONPATH PREFIX "/share/python" VERSION ":" \
16835136	77	- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
16835136 JK	78	+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
	79	#endif
	80
	81	#ifndef LANDMARK
	82	@@ -124,7 +124,7 @@
	83	static char exec_prefix[MAXPATHLEN+1];
	84	static char progpath[MAXPATHLEN+1];
	85	static char *module_search_path = NULL;
	86	-static char lib_python[] = "lib/python" VERSION;
	87	+static char lib_python[] = "lib64/python" VERSION;
2db2a190	88	static char share_python[] = "share/python" VERSION;
16835136 JK	89
16835136 JK	90	static void
837202b7	91	@@ -516,7 +516,7 @@
16835136 JK	92	}
	93	else
	94	strncpy(zip_path, PREFIX, MAXPATHLEN);
	95	- joinpath(zip_path, "lib/python00.zip");
	96	+ joinpath(zip_path, "lib64/python00.zip");
	97	bufsz = strlen(zip_path); /* Replace "00" with version */
	98	zip_path[bufsz - 6] = VERSION[0];
	99	zip_path[bufsz - 5] = VERSION[2];
837202b7	100	diff -Nur Python-2.4.orig/setup.py Python-2.4/setup.py
	101	--- Python-2.4.orig/setup.py 2004-12-23 09:49:49.798803000 +0000
	102	+++ Python-2.4/setup.py 2004-12-23 09:56:00.934382096 +0000
	103	@@ -239,7 +239,7 @@
	104
	105	def detect_modules(self):
	106	# Ensure that /usr/local is always used
	107	- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
	108	+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
	109	add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
352d3900	110
837202b7	111	# Add paths to popular package managers on OS X/darwin