Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 704 - (show annotations) (download)
    Wed Oct 15 17:28:32 2008 UTC (15 years, 7 months ago) by niro
    File size: 7447 byte(s) 
    -re-diffed against python-2.6.0
    1 diff -Naur Python-2.6/Lib/distutils/command/install.py Python-2.6-magellan/Lib/distutils/command/install.py
    2 --- Python-2.6/Lib/distutils/command/install.py 2008-05-07 00:41:46.000000000 +0200
    3 +++ Python-2.6-magellan/Lib/distutils/command/install.py 2008-10-15 19:27:11.000000000 +0200
    4 @@ -42,14 +42,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.6/Lib/distutils/sysconfig.py Python-2.6-magellan/Lib/distutils/sysconfig.py
    22 --- Python-2.6/Lib/distutils/sysconfig.py 2008-06-05 14:58:24.000000000 +0200
    23 +++ Python-2.6-magellan/Lib/distutils/sysconfig.py 2008-10-15 19:29:26.000000000 +0200
    24 @@ -115,8 +115,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.6/Lib/site.py Python-2.6-magellan/Lib/site.py
    39 --- Python-2.6/Lib/site.py 2008-05-10 19:36:24.000000000 +0200
    40 +++ Python-2.6-magellan/Lib/site.py 2008-10-15 19:32:13.000000000 +0200
    41 @@ -265,9 +265,13 @@
    42 if sys.platform in ('os2emx', 'riscos'):
    43 sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
    44 elif os.sep == '/':
    45 - sitedirs.append(os.path.join(prefix, "lib",
    46 + sitedirs.append(os.path.join(prefix, "lib64",
    47 "python" + sys.version[:3],
    48 "site-packages"))
    49 + os.path.join(prefix, "lib",
    50 + "python" + sys.version[:3],
    51 + "site-packages"),
    52 + os.path.join(prefix, "lib64", "site-python"),
    53 sitedirs.append(os.path.join(prefix, "lib", "site-python"))
    54 else:
    55 sitedirs.append(prefix)
    56 diff -Naur Python-2.6/Makefile.pre.in Python-2.6-magellan/Makefile.pre.in
    57 --- Python-2.6/Makefile.pre.in 2008-09-06 00:59:17.000000000 +0200
    58 +++ Python-2.6-magellan/Makefile.pre.in 2008-10-15 19:32:58.000000000 +0200
    59 @@ -87,11 +87,11 @@
    60
    61 # Expanded directories
    62 BINDIR= $(exec_prefix)/bin
    63 -LIBDIR= $(exec_prefix)/lib
    64 +LIBDIR= $(exec_prefix)/lib64
    65 MANDIR= @mandir@
    66 INCLUDEDIR= @includedir@
    67 CONFINCLUDEDIR= $(exec_prefix)/include
    68 -SCRIPTDIR= $(prefix)/lib
    69 +SCRIPTDIR= $(prefix)/lib64
    70
    71 # Detailed destination directories
    72 BINLIBDEST= $(LIBDIR)/python$(VERSION)
    73 diff -Naur Python-2.6/Modules/getpath.c Python-2.6-magellan/Modules/getpath.c
    74 --- Python-2.6/Modules/getpath.c 2007-03-10 08:38:14.000000000 +0100
    75 +++ Python-2.6-magellan/Modules/getpath.c 2008-10-15 19:34:12.000000000 +0200
    76 @@ -117,8 +117,8 @@
    77 #endif
    78
    79 #ifndef PYTHONPATH
    80 -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
    81 - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
    82 +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
    83 + EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
    84 #endif
    85
    86 #ifndef LANDMARK
    87 @@ -129,7 +129,7 @@
    88 static char exec_prefix[MAXPATHLEN+1];
    89 static char progpath[MAXPATHLEN+1];
    90 static char *module_search_path = NULL;
    91 -static char lib_python[] = "lib/python" VERSION;
    92 +static char lib_python[] = "lib64/python" VERSION;
    93
    94 static void
    95 reduce(char *dir)
    96 @@ -524,7 +524,7 @@
    97 }
    98 else
    99 strncpy(zip_path, PREFIX, MAXPATHLEN);
    100 - joinpath(zip_path, "lib/python00.zip");
    101 + joinpath(zip_path, "lib64/python00.zip");
    102 bufsz = strlen(zip_path); /* Replace "00" with version */
    103 zip_path[bufsz - 6] = VERSION[0];
    104 zip_path[bufsz - 5] = VERSION[2];
    105 @@ -534,7 +534,7 @@
    106 fprintf(stderr,
    107 "Could not find platform dependent libraries <exec_prefix>\n");
    108 strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
    109 - joinpath(exec_prefix, "lib/lib-dynload");
    110 + joinpath(exec_prefix, "lib64/lib-dynload");
    111 }
    112 /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
    113
    114 diff -Naur Python-2.6/Modules/Setup.dist Python-2.6-magellan/Modules/Setup.dist
    115 --- Python-2.6/Modules/Setup.dist 2008-09-21 09:31:52.000000000 +0200
    116 +++ Python-2.6-magellan/Modules/Setup.dist 2008-10-15 19:35:18.000000000 +0200
    117 @@ -409,7 +409,7 @@
    118 #DB=/usr/local/BerkeleyDB.4.0
    119 #DBLIBVER=4.0
    120 #DBINC=$(DB)/include
    121 -#DBLIB=$(DB)/lib
    122 +#DBLIB=$(DB)/lib64
    123 #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
    124
    125 # Historical Berkeley DB 1.85
    126 @@ -455,7 +455,7 @@
    127 # Andrew Kuchling's zlib module.
    128 # This require zlib 1.1.3 (or later).
    129 # See http://www.gzip.org/zlib/
    130 -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
    131 +#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
    132
    133 # Interface to the Expat XML parser
    134 #
    135 diff -Naur Python-2.6/setup.py Python-2.6-magellan/setup.py
    136 --- Python-2.6/setup.py 2008-09-30 02:15:45.000000000 +0200
    137 +++ Python-2.6-magellan/setup.py 2008-10-15 19:36:37.000000000 +0200
    138 @@ -310,7 +310,7 @@
    139
    140 def detect_modules(self):
    141 # Ensure that /usr/local is always used
    142 - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
    143 + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
    144 add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
    145
    146 # Add paths specified in the environment variables LDFLAGS and
    147 @@ -583,11 +583,11 @@
    148 elif self.compiler.find_library_file(lib_dirs, 'curses'):
    149 readline_libs.append('curses')
    150 elif self.compiler.find_library_file(lib_dirs +
    151 - ['/usr/lib/termcap'],
    152 + ['/usr/lib64/termcap'],
    153 'termcap'):
    154 readline_libs.append('termcap')
    155 exts.append( Extension('readline', ['readline.c'],
    156 - library_dirs=['/usr/lib/termcap'],
    157 + library_dirs=['/usr/lib64/termcap'],
    158 extra_link_args=readline_extra_link_args,
    159 libraries=readline_libs) )
    160 else:
    161 @@ -624,8 +624,8 @@
    162 if krb5_h:
    163 ssl_incs += krb5_h
    164 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
    165 - ['/usr/local/ssl/lib',
    166 - '/usr/contrib/ssl/lib/'
    167 + ['/usr/local/ssl/lib64',
    168 + '/usr/contrib/ssl/lib64/'
    169 ] )
    170
    171 if (ssl_incs is not None and