Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2914 - (show annotations) (download)
    Tue May 2 10:10:12 2017 UTC (7 years ago) by niro
    File size: 12038 byte(s) 
    -re-diffed against python-2.7.13
    1 diff -Naur Python-2.7.13/Lib/distutils/command/install.py Python-2.7.13-lib64/Lib/distutils/command/install.py
    2 --- Python-2.7.13/Lib/distutils/command/install.py 2016-12-17 21:05:05.000000000 +0100
    3 +++ Python-2.7.13-lib64/Lib/distutils/command/install.py 2017-05-02 11:43:54.339485667 +0200
    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.13/Lib/distutils/sysconfig.py Python-2.7.13-lib64/Lib/distutils/sysconfig.py
    25 --- Python-2.7.13/Lib/distutils/sysconfig.py 2016-12-17 21:05:05.000000000 +0100
    26 +++ Python-2.7.13-lib64/Lib/distutils/sysconfig.py 2017-05-02 11:46:18.918871657 +0200
    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.13/Lib/site.py Python-2.7.13-lib64/Lib/site.py
    37 --- Python-2.7.13/Lib/site.py 2016-12-17 21:05:06.000000000 +0100
    38 +++ Python-2.7.13-lib64/Lib/site.py 2017-05-02 11:48:44.022252188 +0200
    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 return sitepackages
    57
    58 def addsitepackages(known_paths):
    59 diff -Naur Python-2.7.13/Lib/sysconfig.py Python-2.7.13-lib64/Lib/sysconfig.py
    60 --- Python-2.7.13/Lib/sysconfig.py 2016-12-17 21:05:06.000000000 +0100
    61 +++ Python-2.7.13-lib64/Lib/sysconfig.py 2017-05-02 11:51:02.844703129 +0200
    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.13/Lib/test/test_site.py Python-2.7.13-lib64/Lib/test/test_site.py
    107 --- Python-2.7.13/Lib/test/test_site.py 2016-12-17 21:05:06.000000000 +0100
    108 +++ Python-2.7.13-lib64/Lib/test/test_site.py 2017-05-02 11:53:23.289136160 +0200
    109 @@ -236,16 +236,16 @@
    110 elif os.sep == '/':
    111 # OS X, 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.13/Makefile.pre.in Python-2.7.13-lib64/Makefile.pre.in
    130 --- Python-2.7.13/Makefile.pre.in 2016-12-17 21:05:06.000000000 +0100
    131 +++ Python-2.7.13-lib64/Makefile.pre.in 2017-05-02 11:55:08.733959780 +0200
    132 @@ -111,7 +111,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.13/Modules/getpath.c Python-2.7.13-lib64/Modules/getpath.c
    142 --- Python-2.7.13/Modules/getpath.c 2016-12-17 21:05:07.000000000 +0100
    143 +++ Python-2.7.13-lib64/Modules/getpath.c 2017-05-02 11:58:04.275068071 +0200
    144 @@ -108,7 +108,7 @@
    145 static char exec_prefix[MAXPATHLEN+1];
    146 static char progpath[MAXPATHLEN+1];
    147 static char *module_search_path = NULL;
    148 -static char lib_python[] = "lib/python" VERSION;
    149 +static char lib_python[] = "lib64/python" VERSION;
    150
    151 static void
    152 reduce(char *dir)
    153 @@ -520,7 +520,7 @@
    154 }
    155 else
    156 strncpy(zip_path, PREFIX, MAXPATHLEN);
    157 - joinpath(zip_path, "lib/python00.zip");
    158 + joinpath(zip_path, "lib64/python00.zip");
    159 bufsz = strlen(zip_path); /* Replace "00" with version */
    160 zip_path[bufsz - 6] = VERSION[0];
    161 zip_path[bufsz - 5] = VERSION[2];
    162 @@ -530,7 +530,7 @@
    163 fprintf(stderr,
    164 "Could not find platform dependent libraries <exec_prefix>\n");
    165 strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
    166 - joinpath(exec_prefix, "lib/lib-dynload");
    167 + joinpath(exec_prefix, "lib64/lib-dynload");
    168 }
    169 /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
    170
    171 diff -Naur Python-2.7.13/Modules/Setup.dist Python-2.7.13-lib64/Modules/Setup.dist
    172 --- Python-2.7.13/Modules/Setup.dist 2016-12-17 21:05:07.000000000 +0100
    173 +++ Python-2.7.13-lib64/Modules/Setup.dist 2017-05-02 12:00:17.815639668 +0200
    174 @@ -347,7 +347,7 @@
    175 # *** Uncomment and edit to reflect your Tcl/Tk versions:
    176 # -ltk8.2 -ltcl8.2 \
    177 # *** Uncomment and edit to reflect where your X11 libraries are:
    178 -# -L/usr/X11R6/lib \
    179 +# -L/usr/X11R6/lib64 \
    180 # *** Or uncomment this for Solaris:
    181 # -L/usr/openwin/lib \
    182 # *** Uncomment these for TOGL extension only:
    183 @@ -418,7 +418,7 @@
    184 #DB=/usr/local/BerkeleyDB.4.0
    185 #DBLIBVER=4.0
    186 #DBINC=$(DB)/include
    187 -#DBLIB=$(DB)/lib
    188 +#DBLIB=$(DB)/lib64
    189 #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
    190
    191 # Historical Berkeley DB 1.85
    192 @@ -464,7 +464,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-2.7.13/setup.py Python-2.7.13-lib64/setup.py
    202 --- Python-2.7.13/setup.py 2016-12-17 21:05:07.000000000 +0100
    203 +++ Python-2.7.13-lib64/setup.py 2017-05-02 12:08:41.172173605 +0200
    204 @@ -456,7 +456,7 @@
    205 def detect_modules(self):
    206 # Ensure that /usr/local is always used
    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 if cross_compiling:
    212 self.add_gcc_paths()
    213 @@ -524,7 +524,6 @@
    214 add_dir_to_list(inc_dirs, d)
    215 for d in (
    216 '/lib64', '/usr/lib64',
    217 - '/lib', '/usr/lib',
    218 ):
    219 add_dir_to_list(lib_dirs, d)
    220 exts = []
    221 @@ -782,11 +781,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 @@ -821,8 +820,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 @@ -1942,14 +1941,13 @@
    247 elif os.path.exists('/usr/X11R6/include'):
    248 include_dirs.append('/usr/X11R6/include')
    249 added_lib_dirs.append('/usr/X11R6/lib64')
    250 - added_lib_dirs.append('/usr/X11R6/lib')
    251 elif os.path.exists('/usr/X11R5/include'):
    252 include_dirs.append('/usr/X11R5/include')
    253 - added_lib_dirs.append('/usr/X11R5/lib')
    254 + added_lib_dirs.append('/usr/X11R5/lib64')
    255 else:
    256 # Assume default location for X11
    257 include_dirs.append('/usr/X11/include')
    258 - added_lib_dirs.append('/usr/X11/lib')
    259 + added_lib_dirs.append('/usr/X11/lib64')
    260
    261 # If Cygwin, then verify that X is installed before proceeding
    262 if host_platform == 'cygwin':