Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2324 - (show annotations) (download)
    Mon Nov 18 13:00:12 2013 UTC (10 years, 5 months ago) by niro
    File size: 12113 byte(s) 
    -re-diffed for python-2.7.6
    1 diff -Naur Python-2.7.6/Lib/distutils/command/install.py Python-2.7.6-lib64/Lib/distutils/command/install.py
    2 --- Python-2.7.6/Lib/distutils/command/install.py 2013-11-10 07:36:40.000000000 +0000
    3 +++ Python-2.7.6-lib64/Lib/distutils/command/install.py 2013-11-18 15:17:22.585000000 +0000
    4 @@ -41,15 +41,15 @@
    5
    6 INSTALL_SCHEMES = {
    7 'unix_prefix': {
    8 - 'purelib': '$base/lib/python$py_version_short/site-packages',
    9 - 'platlib': '$platbase/lib/python$py_version_short/site-packages',
    10 + 'purelib': '$base/lib64/python$py_version_short/site-packages',
    11 + 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
    12 'headers': '$base/include/python$py_version_short/$dist_name',
    13 'scripts': '$base/bin',
    14 'data' : '$base',
    15 },
    16 'unix_home': {
    17 - 'purelib': '$base/lib/python',
    18 - 'platlib': '$base/lib/python',
    19 + 'purelib': '$base/lib64/python',
    20 + 'platlib': '$base/lib64/python',
    21 'headers': '$base/include/python/$dist_name',
    22 'scripts': '$base/bin',
    23 'data' : '$base',
    24 diff -Naur Python-2.7.6/Lib/distutils/sysconfig.py Python-2.7.6-lib64/Lib/distutils/sysconfig.py
    25 --- Python-2.7.6/Lib/distutils/sysconfig.py 2013-11-10 07:36:40.000000000 +0000
    26 +++ Python-2.7.6-lib64/Lib/distutils/sysconfig.py 2013-11-18 15:18:09.513000000 +0000
    27 @@ -120,7 +120,7 @@
    28
    29 if os.name == "posix":
    30 libpython = os.path.join(prefix,
    31 - "lib", "python" + get_python_version())
    32 + "lib64", "python" + get_python_version())
    33 if standard_lib:
    34 return libpython
    35 else:
    36 diff -Naur Python-2.7.6/Lib/site.py Python-2.7.6-lib64/Lib/site.py
    37 --- Python-2.7.6/Lib/site.py 2013-11-10 07:36:40.000000000 +0000
    38 +++ Python-2.7.6-lib64/Lib/site.py 2013-11-18 15:20:38.130000000 +0000
    39 @@ -286,15 +286,15 @@
    40 seen.add(prefix)
    41
    42 if sys.platform in ('os2emx', 'riscos'):
    43 - sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
    44 + sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
    45 elif os.sep == '/':
    46 - sitepackages.append(os.path.join(prefix, "lib",
    47 + sitepackages.append(os.path.join(prefix, "lib64",
    48 "python" + sys.version[:3],
    49 "site-packages"))
    50 - sitepackages.append(os.path.join(prefix, "lib", "site-python"))
    51 + sitepackages.append(os.path.join(prefix, "lib64", "site-python"))
    52 else:
    53 sitepackages.append(prefix)
    54 - sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
    55 + sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
    56 if sys.platform == "darwin":
    57 # for framework builds *only* we add the standard Apple
    58 # locations.
    59 diff -Naur Python-2.7.6/Lib/sysconfig.py Python-2.7.6-lib64/Lib/sysconfig.py
    60 --- Python-2.7.6/Lib/sysconfig.py 2013-11-10 07:36:40.000000000 +0000
    61 +++ Python-2.7.6-lib64/Lib/sysconfig.py 2013-11-18 15:23:35.883000000 +0000
    62 @@ -7,20 +7,20 @@
    63
    64 _INSTALL_SCHEMES = {
    65 'posix_prefix': {
    66 - 'stdlib': '{base}/lib/python{py_version_short}',
    67 - 'platstdlib': '{platbase}/lib/python{py_version_short}',
    68 - 'purelib': '{base}/lib/python{py_version_short}/site-packages',
    69 - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
    70 + 'stdlib': '{base}/lib64/python{py_version_short}',
    71 + 'platstdlib': '{platbase}/lib64/python{py_version_short}',
    72 + 'purelib': '{base}/lib64/python{py_version_short}/site-packages',
    73 + 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
    74 'include': '{base}/include/python{py_version_short}',
    75 'platinclude': '{platbase}/include/python{py_version_short}',
    76 'scripts': '{base}/bin',
    77 'data': '{base}',
    78 },
    79 'posix_home': {
    80 - 'stdlib': '{base}/lib/python',
    81 - 'platstdlib': '{base}/lib/python',
    82 - 'purelib': '{base}/lib/python',
    83 - 'platlib': '{base}/lib/python',
    84 + 'stdlib': '{base}/lib64/python',
    85 + 'platstdlib': '{base}/lib64/python',
    86 + 'purelib': '{base}/lib64/python',
    87 + 'platlib': '{base}/lib64/python',
    88 'include': '{base}/include/python',
    89 'platinclude': '{base}/include/python',
    90 'scripts': '{base}/bin',
    91 @@ -65,10 +65,10 @@
    92 'data' : '{userbase}',
    93 },
    94 'posix_user': {
    95 - 'stdlib': '{userbase}/lib/python{py_version_short}',
    96 - 'platstdlib': '{userbase}/lib/python{py_version_short}',
    97 - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
    98 - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
    99 + 'stdlib': '{userbase}/lib64/python{py_version_short}',
    100 + 'platstdlib': '{userbase}/lib64/python{py_version_short}',
    101 + 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages',
    102 + 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
    103 'include': '{userbase}/include/python{py_version_short}',
    104 'scripts': '{userbase}/bin',
    105 'data' : '{userbase}',
    106 diff -Naur Python-2.7.6/Lib/test/test_site.py Python-2.7.6-lib64/Lib/test/test_site.py
    107 --- Python-2.7.6/Lib/test/test_site.py 2013-11-10 07:36:40.000000000 +0000
    108 +++ Python-2.7.6-lib64/Lib/test/test_site.py 2013-11-18 15:24:33.521000000 +0000
    109 @@ -242,16 +242,16 @@
    110 elif os.sep == '/':
    111 # OS X non-framwework builds, Linux, FreeBSD, etc
    112 self.assertEqual(len(dirs), 2)
    113 - wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
    114 + wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3],
    115 'site-packages')
    116 self.assertEqual(dirs[0], wanted)
    117 - wanted = os.path.join('xoxo', 'lib', 'site-python')
    118 + wanted = os.path.join('xoxo', 'lib64', 'site-python')
    119 self.assertEqual(dirs[1], wanted)
    120 else:
    121 # other platforms
    122 self.assertEqual(len(dirs), 2)
    123 self.assertEqual(dirs[0], 'xoxo')
    124 - wanted = os.path.join('xoxo', 'lib', 'site-packages')
    125 + wanted = os.path.join('xoxo', 'lib64', 'site-packages')
    126 self.assertEqual(dirs[1], wanted)
    127
    128 class PthFile(object):
    129 diff -Naur Python-2.7.6/Makefile.pre.in Python-2.7.6-lib64/Makefile.pre.in
    130 --- Python-2.7.6/Makefile.pre.in 2013-11-10 07:36:41.000000000 +0000
    131 +++ Python-2.7.6-lib64/Makefile.pre.in 2013-11-18 15:25:13.234000000 +0000
    132 @@ -106,7 +106,7 @@
    133 MANDIR= @mandir@
    134 INCLUDEDIR= @includedir@
    135 CONFINCLUDEDIR= $(exec_prefix)/include
    136 -SCRIPTDIR= $(prefix)/lib
    137 +SCRIPTDIR= $(prefix)/lib64
    138
    139 # Detailed destination directories
    140 BINLIBDEST= $(LIBDIR)/python$(VERSION)
    141 diff -Naur Python-2.7.6/Modules/getpath.c Python-2.7.6-lib64/Modules/getpath.c
    142 --- Python-2.7.6/Modules/getpath.c 2013-11-10 07:36:41.000000000 +0000
    143 +++ Python-2.7.6-lib64/Modules/getpath.c 2013-11-18 15:27:10.754000000 +0000
    144 @@ -117,8 +117,8 @@
    145 #endif
    146
    147 #ifndef PYTHONPATH
    148 -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
    149 - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
    150 +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
    151 + EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
    152 #endif
    153
    154 #ifndef LANDMARK
    155 @@ -129,7 +129,7 @@
    156 static char exec_prefix[MAXPATHLEN+1];
    157 static char progpath[MAXPATHLEN+1];
    158 static char *module_search_path = NULL;
    159 -static char lib_python[] = "lib/python" VERSION;
    160 +static char lib_python[] = "lib64/python" VERSION;
    161
    162 static void
    163 reduce(char *dir)
    164 @@ -543,7 +543,7 @@
    165 }
    166 else
    167 strncpy(zip_path, PREFIX, MAXPATHLEN);
    168 - joinpath(zip_path, "lib/python00.zip");
    169 + joinpath(zip_path, "lib64/python00.zip");
    170 bufsz = strlen(zip_path); /* Replace "00" with version */
    171 zip_path[bufsz - 6] = VERSION[0];
    172 zip_path[bufsz - 5] = VERSION[2];
    173 @@ -553,7 +553,7 @@
    174 fprintf(stderr,
    175 "Could not find platform dependent libraries <exec_prefix>\n");
    176 strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
    177 - joinpath(exec_prefix, "lib/lib-dynload");
    178 + joinpath(exec_prefix, "lib64/lib-dynload");
    179 }
    180 /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
    181
    182 diff -Naur Python-2.7.6/Modules/Setup.dist Python-2.7.6-lib64/Modules/Setup.dist
    183 --- Python-2.7.6/Modules/Setup.dist 2013-11-10 07:36:41.000000000 +0000
    184 +++ Python-2.7.6-lib64/Modules/Setup.dist 2013-11-18 15:28:39.786000000 +0000
    185 @@ -347,7 +347,7 @@
    186 # *** Uncomment and edit to reflect your Tcl/Tk versions:
    187 # -ltk8.2 -ltcl8.2 \
    188 # *** Uncomment and edit to reflect where your X11 libraries are:
    189 -# -L/usr/X11R6/lib \
    190 +# -L/usr/X11R6/lib64 \
    191 # *** Or uncomment this for Solaris:
    192 # -L/usr/openwin/lib \
    193 # *** Uncomment these for TOGL extension only:
    194 @@ -418,7 +418,7 @@
    195 #DB=/usr/local/BerkeleyDB.4.0
    196 #DBLIBVER=4.0
    197 #DBINC=$(DB)/include
    198 -#DBLIB=$(DB)/lib
    199 +#DBLIB=$(DB)/lib64
    200 #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
    201
    202 # Historical Berkeley DB 1.85
    203 @@ -464,7 +464,7 @@
    204 # Andrew Kuchling's zlib module.
    205 # This require zlib 1.1.3 (or later).
    206 # See http://www.gzip.org/zlib/
    207 -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
    208 +#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
    209
    210 # Interface to the Expat XML parser
    211 #
    212 diff -Naur Python-2.7.6/setup.py Python-2.7.6-lib64/setup.py
    213 --- Python-2.7.6/setup.py 2013-11-10 07:36:41.000000000 +0000
    214 +++ Python-2.7.6-lib64/setup.py 2013-11-18 15:52:32.034000000 +0000
    215 @@ -438,7 +438,7 @@
    216 def detect_modules(self):
    217 # Ensure that /usr/local is always used
    218 if not cross_compiling:
    219 - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
    220 + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
    221 add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
    222 if cross_compiling:
    223 self.add_gcc_paths()
    224 @@ -506,7 +506,6 @@
    225 add_dir_to_list(inc_dirs, d)
    226 for d in (
    227 '/lib64', '/usr/lib64',
    228 - '/lib', '/usr/lib',
    229 ):
    230 add_dir_to_list(lib_dirs, d)
    231 exts = []
    232 @@ -758,7 +757,7 @@
    233 elif curses_library:
    234 readline_libs.append(curses_library)
    235 elif self.compiler.find_library_file(lib_dirs +
    236 - ['/usr/lib/termcap'],
    237 + ['/usr/lib64/termcap'],
    238 'termcap'):
    239 readline_libs.append('termcap')
    240 exts.append( Extension('readline', ['readline.c'],
    241 @@ -797,8 +796,8 @@
    242 if krb5_h:
    243 ssl_incs += krb5_h
    244 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
    245 - ['/usr/local/ssl/lib',
    246 - '/usr/contrib/ssl/lib/'
    247 + ['/usr/local/ssl/lib64',
    248 + '/usr/contrib/ssl/lib64/'
    249 ] )
    250
    251 if (ssl_incs is not None and
    252 @@ -1914,14 +1913,13 @@
    253 elif os.path.exists('/usr/X11R6/include'):
    254 include_dirs.append('/usr/X11R6/include')
    255 added_lib_dirs.append('/usr/X11R6/lib64')
    256 - added_lib_dirs.append('/usr/X11R6/lib')
    257 elif os.path.exists('/usr/X11R5/include'):
    258 include_dirs.append('/usr/X11R5/include')
    259 - added_lib_dirs.append('/usr/X11R5/lib')
    260 + added_lib_dirs.append('/usr/X11R5/lib64')
    261 else:
    262 # Assume default location for X11
    263 include_dirs.append('/usr/X11/include')
    264 - added_lib_dirs.append('/usr/X11/lib')
    265 + added_lib_dirs.append('/usr/X11/lib64')
    266
    267 # If Cygwin, then verify that X is installed before proceeding
    268 if host_platform == 'cygwin':