Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/python/patches/python-2.4.2-lib64.patch

    Contents of /trunk/python/patches/python-2.4.2-lib64.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 7532 byte(s) 
    -import
    1 diff -Naur Python-2.4.2/Lib/distutils/command/install.py Python-2.4.2-lib64/Lib/distutils/command/install.py
    2 --- Python-2.4.2/Lib/distutils/command/install.py 2005-01-20 20:15:39.000000000 +0100
    3 +++ Python-2.4.2-lib64/Lib/distutils/command/install.py 2006-04-09 18:23:03.000000000 +0200
    4 @@ -39,14 +39,14 @@
    5 INSTALL_SCHEMES = {
    6 'unix_prefix': {
    7 'purelib': '$base/lib/python$py_version_short/site-packages',
    8 - 'platlib': '$platbase/lib/python$py_version_short/site-packages',
    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': {
    15 'purelib': '$base/lib/python',
    16 - 'platlib': '$base/lib/python',
    17 + 'platlib': '$base/lib64/python',
    18 'headers': '$base/include/python/$dist_name',
    19 'scripts': '$base/bin',
    20 'data' : '$base',
    21 diff -Naur Python-2.4.2/Lib/distutils/sysconfig.py Python-2.4.2-lib64/Lib/distutils/sysconfig.py
    22 --- Python-2.4.2/Lib/distutils/sysconfig.py 2005-01-07 00:16:03.000000000 +0100
    23 +++ Python-2.4.2-lib64/Lib/distutils/sysconfig.py 2006-04-09 18:23:03.000000000 +0200
    24 @@ -99,8 +99,12 @@
    25 prefix = plat_specific and EXEC_PREFIX or PREFIX
    26
    27 if os.name == "posix":
    28 + if plat_specific or standard_lib:
    29 + lib = "lib64"
    30 + else:
    31 + lib = "lib"
    32 libpython = os.path.join(prefix,
    33 - "lib", "python" + get_python_version())
    34 + lib, "python" + get_python_version())
    35 if standard_lib:
    36 return libpython
    37 else:
    38 diff -Naur Python-2.4.2/Lib/site.py Python-2.4.2-lib64/Lib/site.py
    39 --- Python-2.4.2/Lib/site.py 2004-07-20 04:28:28.000000000 +0200
    40 +++ Python-2.4.2-lib64/Lib/site.py 2006-04-09 18:23:03.000000000 +0200
    41 @@ -179,9 +179,14 @@
    42 sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
    43 elif os.sep == '/':
    44 sitedirs = [os.path.join(prefix,
    45 - "lib",
    46 + "lib64",
    47 "python" + sys.version[:3],
    48 "site-packages"),
    49 + os.path.join(prefix,
    50 + "lib",
    51 + "python" + sys.version[:3],
    52 + "site-packages"),
    53 + os.path.join(prefix, "lib64", "site-python"),
    54 os.path.join(prefix, "lib", "site-python")]
    55 else:
    56 sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
    57 diff -Naur Python-2.4.2/Makefile.pre.in Python-2.4.2-lib64/Makefile.pre.in
    58 --- Python-2.4.2/Makefile.pre.in 2005-03-29 01:23:01.000000000 +0200
    59 +++ Python-2.4.2-lib64/Makefile.pre.in 2006-04-09 18:23:03.000000000 +0200
    60 @@ -79,11 +79,11 @@
    61
    62 # Expanded directories
    63 BINDIR= $(exec_prefix)/bin
    64 -LIBDIR= $(exec_prefix)/lib
    65 +LIBDIR= $(exec_prefix)/lib64
    66 MANDIR= @mandir@
    67 INCLUDEDIR= @includedir@
    68 CONFINCLUDEDIR= $(exec_prefix)/include
    69 -SCRIPTDIR= $(prefix)/lib
    70 +SCRIPTDIR= $(prefix)/lib64
    71
    72 # Detailed destination directories
    73 BINLIBDEST= $(LIBDIR)/python$(VERSION)
    74 diff -Naur Python-2.4.2/Modules/getpath.c Python-2.4.2-lib64/Modules/getpath.c
    75 --- Python-2.4.2/Modules/getpath.c 2004-08-08 03:00:47.000000000 +0200
    76 +++ Python-2.4.2-lib64/Modules/getpath.c 2006-04-09 18:23:03.000000000 +0200
    77 @@ -112,8 +112,8 @@
    78 #endif
    79
    80 #ifndef PYTHONPATH
    81 -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
    82 - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
    83 +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
    84 + EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
    85 #endif
    86
    87 #ifndef LANDMARK
    88 @@ -124,7 +124,7 @@
    89 static char exec_prefix[MAXPATHLEN+1];
    90 static char progpath[MAXPATHLEN+1];
    91 static char *module_search_path = NULL;
    92 -static char lib_python[] = "lib/python" VERSION;
    93 +static char lib_python[] = "lib64/python" VERSION;
    94
    95 static void
    96 reduce(char *dir)
    97 @@ -515,7 +515,7 @@
    98 }
    99 else
    100 strncpy(zip_path, PREFIX, MAXPATHLEN);
    101 - joinpath(zip_path, "lib/python00.zip");
    102 + joinpath(zip_path, "lib64/python00.zip");
    103 bufsz = strlen(zip_path); /* Replace "00" with version */
    104 zip_path[bufsz - 6] = VERSION[0];
    105 zip_path[bufsz - 5] = VERSION[2];
    106 @@ -525,7 +525,7 @@
    107 fprintf(stderr,
    108 "Could not find platform dependent libraries <exec_prefix>\n");
    109 strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
    110 - joinpath(exec_prefix, "lib/lib-dynload");
    111 + joinpath(exec_prefix, "lib64/lib-dynload");
    112 }
    113 /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
    114
    115 diff -Naur Python-2.4.2/Modules/Setup.dist Python-2.4.2-lib64/Modules/Setup.dist
    116 --- Python-2.4.2/Modules/Setup.dist 2005-03-10 00:47:44.000000000 +0100
    117 +++ Python-2.4.2-lib64/Modules/Setup.dist 2006-04-09 18:30:22.000000000 +0200
    118 @@ -400,7 +400,7 @@
    119 #DB=/usr/local/BerkeleyDB.4.0
    120 #DBLIBVER=4.0
    121 #DBINC=$(DB)/include
    122 -#DBLIB=$(DB)/lib
    123 +#DBLIB=$(DB)/lib64
    124 #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
    125
    126 # Historical Berkeley DB 1.85
    127 @@ -446,7 +446,7 @@
    128 # Andrew Kuchling's zlib module.
    129 # This require zlib 1.1.3 (or later).
    130 # See http://www.gzip.org/zlib/
    131 -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
    132 +#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
    133
    134 # Interface to the Expat XML parser
    135 #
    136 diff -Naur Python-2.4.2/setup.py Python-2.4.2-lib64/setup.py
    137 --- Python-2.4.2/setup.py 2006-04-09 18:38:43.000000000 +0200
    138 +++ Python-2.4.2-lib64/setup.py 2006-04-09 18:23:03.000000000 +0200
    139 @@ -247,7 +247,7 @@
    140 def detect_modules(self):
    141 global disable_ssl
    142 # Ensure that /usr/local is always used
    143 - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
    144 + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
    145 add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
    146
    147 # Add paths to popular package managers on OS X/darwin
    148 @@ -437,11 +437,11 @@
    149 elif self.compiler.find_library_file(lib_dirs, 'curses'):
    150 readline_libs.append('curses')
    151 elif self.compiler.find_library_file(lib_dirs +
    152 - ['/usr/lib/termcap'],
    153 + ['/usr/lib64/termcap'],
    154 'termcap'):
    155 readline_libs.append('termcap')
    156 exts.append( Extension('readline', ['readline.c'],
    157 - library_dirs=['/usr/lib/termcap'],
    158 + library_dirs=['/usr/lib64/termcap'],
    159 libraries=readline_libs) )
    160 if platform not in ['mac']:
    161 # crypt module.
    162 @@ -470,8 +470,8 @@
    163 if krb5_h:
    164 ssl_incs += krb5_h
    165 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
    166 - ['/usr/local/ssl/lib',
    167 - '/usr/contrib/ssl/lib/'
    168 + ['/usr/local/ssl/lib64',
    169 + '/usr/contrib/ssl/lib64/'
    170 ] )
    171
    172 if (ssl_incs is not None and