Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2266 - (show annotations) (download)
    Wed Aug 21 15:15:17 2013 UTC (10 years, 8 months ago) by niro
    File size: 12059 byte(s) 
    -re-diffed patches for 3.3.2
    1 diff -Naur Python-3.3.2/Lib/distutils/command/install.py Python-3.3.2-lib64/Lib/distutils/command/install.py
    2 --- Python-3.3.2/Lib/distutils/command/install.py 2013-05-15 16:32:54.000000000 +0000
    3 +++ Python-3.3.2-lib64/Lib/distutils/command/install.py 2013-08-21 17:35:53.580000000 +0000
    4 @@ -44,15 +44,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$abiflags/$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-3.3.2/Lib/distutils/sysconfig.py Python-3.3.2-lib64/Lib/distutils/sysconfig.py
    25 --- Python-3.3.2/Lib/distutils/sysconfig.py 2013-05-15 16:32:54.000000000 +0000
    26 +++ Python-3.3.2-lib64/Lib/distutils/sysconfig.py 2013-08-21 17:39:11.448000000 +0000
    27 @@ -144,7 +144,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-3.3.2/Lib/site.py Python-3.3.2-lib64/Lib/site.py
    37 --- Python-3.3.2/Lib/site.py 2013-05-15 16:32:55.000000000 +0000
    38 +++ Python-3.3.2-lib64/Lib/site.py 2013-08-21 17:40:27.018000000 +0000
    39 @@ -303,13 +303,13 @@
    40 if sys.platform in ('os2emx', 'riscos'):
    41 sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
    42 elif os.sep == '/':
    43 - sitepackages.append(os.path.join(prefix, "lib",
    44 + sitepackages.append(os.path.join(prefix, "lib64",
    45 "python" + sys.version[:3],
    46 "site-packages"))
    47 - sitepackages.append(os.path.join(prefix, "lib", "site-python"))
    48 + sitepackages.append(os.path.join(prefix, "lib64", "site-python"))
    49 else:
    50 sitepackages.append(prefix)
    51 - sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
    52 + sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
    53 if sys.platform == "darwin":
    54 # for framework builds *only* we add the standard Apple
    55 # locations.
    56 diff -Naur Python-3.3.2/Lib/sysconfig.py Python-3.3.2-lib64/Lib/sysconfig.py
    57 --- Python-3.3.2/Lib/sysconfig.py 2013-05-15 16:32:55.000000000 +0000
    58 +++ Python-3.3.2-lib64/Lib/sysconfig.py 2013-08-21 17:42:47.499000000 +0000
    59 @@ -21,10 +21,10 @@
    60
    61 _INSTALL_SCHEMES = {
    62 'posix_prefix': {
    63 - 'stdlib': '{installed_base}/lib/python{py_version_short}',
    64 - 'platstdlib': '{platbase}/lib/python{py_version_short}',
    65 - 'purelib': '{base}/lib/python{py_version_short}/site-packages',
    66 - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
    67 + 'stdlib': '{installed_base}/lib64/python{py_version_short}',
    68 + 'platstdlib': '{platbase}/lib64/python{py_version_short}',
    69 + 'purelib': '{base}/lib64/python{py_version_short}/site-packages',
    70 + 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
    71 'include':
    72 '{installed_base}/include/python{py_version_short}{abiflags}',
    73 'platinclude':
    74 @@ -33,10 +33,10 @@
    75 'data': '{base}',
    76 },
    77 'posix_home': {
    78 - 'stdlib': '{installed_base}/lib/python',
    79 - 'platstdlib': '{base}/lib/python',
    80 - 'purelib': '{base}/lib/python',
    81 - 'platlib': '{base}/lib/python',
    82 + 'stdlib': '{installed_base}/lib64/python',
    83 + 'platstdlib': '{base}/lib64/python',
    84 + 'purelib': '{base}/lib64/python',
    85 + 'platlib': '{base}/lib64/python',
    86 'include': '{installed_base}/include/python',
    87 'platinclude': '{installed_base}/include/python',
    88 'scripts': '{base}/bin',
    89 @@ -81,10 +81,10 @@
    90 'data': '{userbase}',
    91 },
    92 'posix_user': {
    93 - 'stdlib': '{userbase}/lib/python{py_version_short}',
    94 - 'platstdlib': '{userbase}/lib/python{py_version_short}',
    95 - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
    96 - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
    97 + 'stdlib': '{userbase}/lib64/python{py_version_short}',
    98 + 'platstdlib': '{userbase}/lib64/python{py_version_short}',
    99 + 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages',
    100 + 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
    101 'include': '{userbase}/include/python{py_version_short}',
    102 'scripts': '{userbase}/bin',
    103 'data': '{userbase}',
    104 diff -Naur Python-3.3.2/Lib/test/test_site.py Python-3.3.2-lib64/Lib/test/test_site.py
    105 --- Python-3.3.2/Lib/test/test_site.py 2013-05-15 16:32:56.000000000 +0000
    106 +++ Python-3.3.2-lib64/Lib/test/test_site.py 2013-08-21 17:44:20.182000000 +0000
    107 @@ -240,16 +240,16 @@
    108 elif os.sep == '/':
    109 # OS X non-framwework builds, Linux, FreeBSD, etc
    110 self.assertEqual(len(dirs), 2)
    111 - wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
    112 + wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3],
    113 'site-packages')
    114 self.assertEqual(dirs[0], wanted)
    115 - wanted = os.path.join('xoxo', 'lib', 'site-python')
    116 + wanted = os.path.join('xoxo', 'lib64', 'site-python')
    117 self.assertEqual(dirs[1], wanted)
    118 else:
    119 # other platforms
    120 self.assertEqual(len(dirs), 2)
    121 self.assertEqual(dirs[0], 'xoxo')
    122 - wanted = os.path.join('xoxo', 'lib', 'site-packages')
    123 + wanted = os.path.join('xoxo', 'lib64', 'site-packages')
    124 self.assertEqual(dirs[1], wanted)
    125
    126 class PthFile(object):
    127 diff -Naur Python-3.3.2/Makefile.pre.in Python-3.3.2-lib64/Makefile.pre.in
    128 --- Python-3.3.2/Makefile.pre.in 2013-05-15 16:32:57.000000000 +0000
    129 +++ Python-3.3.2-lib64/Makefile.pre.in 2013-08-21 17:43:04.900000000 +0000
    130 @@ -115,7 +115,7 @@
    131 MANDIR= @mandir@
    132 INCLUDEDIR= @includedir@
    133 CONFINCLUDEDIR= $(exec_prefix)/include
    134 -SCRIPTDIR= $(prefix)/lib
    135 +SCRIPTDIR= $(prefix)/lib64
    136 ABIFLAGS= @ABIFLAGS@
    137
    138 # Detailed destination directories
    139 diff -Naur Python-3.3.2/Modules/getpath.c Python-3.3.2-lib64/Modules/getpath.c
    140 --- Python-3.3.2/Modules/getpath.c 2013-05-15 16:32:59.000000000 +0000
    141 +++ Python-3.3.2-lib64/Modules/getpath.c 2013-08-21 17:46:08.872000000 +0000
    142 @@ -122,8 +122,8 @@
    143 #endif
    144
    145 #ifndef PYTHONPATH
    146 -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
    147 - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
    148 +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
    149 + EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
    150 #endif
    151
    152 #ifndef LANDMARK
    153 @@ -135,7 +135,7 @@
    154 static wchar_t progpath[MAXPATHLEN+1];
    155 static wchar_t *module_search_path = NULL;
    156 static int module_search_path_malloced = 0;
    157 -static wchar_t *lib_python = L"lib/python" VERSION;
    158 +static wchar_t *lib_python = L"lib64/python" VERSION;
    159
    160 static void
    161 reduce(wchar_t *dir)
    162 @@ -677,7 +677,7 @@
    163 }
    164 else
    165 wcsncpy(zip_path, _prefix, MAXPATHLEN);
    166 - joinpath(zip_path, L"lib/python00.zip");
    167 + joinpath(zip_path, L"lib64/python00.zip");
    168 bufsz = wcslen(zip_path); /* Replace "00" with version */
    169 zip_path[bufsz - 6] = VERSION[0];
    170 zip_path[bufsz - 5] = VERSION[2];
    171 @@ -687,7 +687,7 @@
    172 fprintf(stderr,
    173 "Could not find platform dependent libraries <exec_prefix>\n");
    174 wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
    175 - joinpath(exec_prefix, L"lib/lib-dynload");
    176 + joinpath(exec_prefix, L"lib64/lib-dynload");
    177 }
    178 /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
    179
    180 diff -Naur Python-3.3.2/Modules/Setup.dist Python-3.3.2-lib64/Modules/Setup.dist
    181 --- Python-3.3.2/Modules/Setup.dist 2013-05-15 16:32:57.000000000 +0000
    182 +++ Python-3.3.2-lib64/Modules/Setup.dist 2013-08-21 17:48:06.602000000 +0000
    183 @@ -279,7 +279,7 @@
    184 # *** Uncomment and edit to reflect your Tcl/Tk versions:
    185 # -ltk8.2 -ltcl8.2 \
    186 # *** Uncomment and edit to reflect where your X11 libraries are:
    187 -# -L/usr/X11R6/lib \
    188 +# -L/usr/X11R6/lib64 \
    189 # *** Or uncomment this for Solaris:
    190 # -L/usr/openwin/lib \
    191 # *** Uncomment these for TOGL extension only:
    192 @@ -354,7 +354,7 @@
    193 # Andrew Kuchling's zlib module.
    194 # This require zlib 1.1.3 (or later).
    195 # See http://www.gzip.org/zlib/
    196 -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
    197 +#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
    198
    199 # Interface to the Expat XML parser
    200 #
    201 diff -Naur Python-3.3.2/setup.py Python-3.3.2-lib64/setup.py
    202 --- Python-3.3.2/setup.py 2013-05-15 16:33:00.000000000 +0000
    203 +++ Python-3.3.2-lib64/setup.py 2013-08-21 17:53:22.979000000 +0000
    204 @@ -439,7 +439,7 @@
    205 # directories (i.e. '.' and 'Include') must be first. See issue
    206 # 10520.
    207 if not cross_compiling:
    208 - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
    209 + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
    210 add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
    211 # only change this for cross builds for 3.3, issues on Mageia
    212 if cross_compiling:
    213 @@ -497,7 +497,6 @@
    214 if not cross_compiling:
    215 lib_dirs = self.compiler.library_dirs + [
    216 '/lib64', '/usr/lib64',
    217 - '/lib', '/usr/lib',
    218 ]
    219 inc_dirs = self.compiler.include_dirs + ['/usr/include']
    220 else:
    221 @@ -712,11 +711,11 @@
    222 elif curses_library:
    223 readline_libs.append(curses_library)
    224 elif self.compiler.find_library_file(lib_dirs +
    225 - ['/usr/lib/termcap'],
    226 + ['/usr/lib64/termcap'],
    227 'termcap'):
    228 readline_libs.append('termcap')
    229 exts.append( Extension('readline', ['readline.c'],
    230 - library_dirs=['/usr/lib/termcap'],
    231 + library_dirs=['/usr/lib64/termcap'],
    232 extra_link_args=readline_extra_link_args,
    233 libraries=readline_libs) )
    234 else:
    235 @@ -753,8 +752,8 @@
    236 if krb5_h:
    237 ssl_incs += krb5_h
    238 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
    239 - ['/usr/local/ssl/lib',
    240 - '/usr/contrib/ssl/lib/'
    241 + ['/usr/local/ssl/lib64',
    242 + '/usr/contrib/ssl/lib64/'
    243 ] )
    244
    245 if (ssl_incs is not None and
    246 @@ -1681,11 +1680,11 @@
    247 added_lib_dirs.append('/usr/X11R6/lib')
    248 elif os.path.exists('/usr/X11R5/include'):
    249 include_dirs.append('/usr/X11R5/include')
    250 - added_lib_dirs.append('/usr/X11R5/lib')
    251 + added_lib_dirs.append('/usr/X11R5/lib64')
    252 else:
    253 # Assume default location for X11
    254 include_dirs.append('/usr/X11/include')
    255 - added_lib_dirs.append('/usr/X11/lib')
    256 + added_lib_dirs.append('/usr/X11/lib64')
    257
    258 # If Cygwin, then verify that X is installed before proceeding
    259 if host_platform == 'cygwin':