Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3104 - (show annotations) (download)
    Thu Apr 26 09:25:41 2018 UTC (6 years ago) by niro
    File size: 12507 byte(s) 
    -rediffed for python-3.6.5
    1 diff -Naur Python-3.6.5/Lib/distutils/command/install.py Python-3.6.5-lib64/Lib/distutils/command/install.py
    2 --- Python-3.6.5/Lib/distutils/command/install.py 2018-03-28 11:19:31.000000000 +0200
    3 +++ Python-3.6.5-lib64/Lib/distutils/command/install.py 2018-04-26 10:25:07.355827891 +0200
    4 @@ -29,15 +29,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.6.5/Lib/distutils/sysconfig.py Python-3.6.5-lib64/Lib/distutils/sysconfig.py
    25 --- Python-3.6.5/Lib/distutils/sysconfig.py 2018-03-28 11:19:31.000000000 +0200
    26 +++ Python-3.6.5-lib64/Lib/distutils/sysconfig.py 2018-04-26 10:25:55.750194137 +0200
    27 @@ -130,7 +130,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.6.5/Lib/distutils/tests/test_install.py Python-3.6.5-lib64/Lib/distutils/tests/test_install.py
    37 --- Python-3.6.5/Lib/distutils/tests/test_install.py 2018-03-28 11:19:31.000000000 +0200
    38 +++ Python-3.6.5-lib64/Lib/distutils/tests/test_install.py 2018-04-26 10:26:30.521738784 +0200
    39 @@ -56,7 +56,7 @@
    40 expected = os.path.normpath(expected)
    41 self.assertEqual(got, expected)
    42
    43 - libdir = os.path.join(destination, "lib", "python")
    44 + libdir = os.path.join(destination, "lib64", "python")
    45 check_path(cmd.install_lib, libdir)
    46 check_path(cmd.install_platlib, libdir)
    47 check_path(cmd.install_purelib, libdir)
    48 diff -Naur Python-3.6.5/Lib/site.py Python-3.6.5-lib64/Lib/site.py
    49 --- Python-3.6.5/Lib/site.py 2018-03-28 11:19:31.000000000 +0200
    50 +++ Python-3.6.5-lib64/Lib/site.py 2018-04-26 10:27:24.800027975 +0200
    51 @@ -304,12 +304,12 @@
    52 seen.add(prefix)
    53
    54 if os.sep == '/':
    55 - sitepackages.append(os.path.join(prefix, "lib",
    56 + sitepackages.append(os.path.join(prefix, "lib64",
    57 "python%d.%d" % sys.version_info[:2],
    58 "site-packages"))
    59 else:
    60 sitepackages.append(prefix)
    61 - sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
    62 + sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
    63 if sys.platform == "darwin":
    64 # for framework builds *only* we add the standard Apple
    65 # locations.
    66 diff -Naur Python-3.6.5/Lib/sysconfig.py Python-3.6.5-lib64/Lib/sysconfig.py
    67 --- Python-3.6.5/Lib/sysconfig.py 2018-03-28 11:19:31.000000000 +0200
    68 +++ Python-3.6.5-lib64/Lib/sysconfig.py 2018-04-26 10:29:21.904494423 +0200
    69 @@ -20,10 +20,10 @@
    70
    71 _INSTALL_SCHEMES = {
    72 'posix_prefix': {
    73 - 'stdlib': '{installed_base}/lib/python{py_version_short}',
    74 - 'platstdlib': '{platbase}/lib/python{py_version_short}',
    75 - 'purelib': '{base}/lib/python{py_version_short}/site-packages',
    76 - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
    77 + 'stdlib': '{installed_base}/lib64/python{py_version_short}',
    78 + 'platstdlib': '{platbase}/lib64/python{py_version_short}',
    79 + 'purelib': '{base}/lib64/python{py_version_short}/site-packages',
    80 + 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
    81 'include':
    82 '{installed_base}/include/python{py_version_short}{abiflags}',
    83 'platinclude':
    84 @@ -32,10 +32,10 @@
    85 'data': '{base}',
    86 },
    87 'posix_home': {
    88 - 'stdlib': '{installed_base}/lib/python',
    89 - 'platstdlib': '{base}/lib/python',
    90 - 'purelib': '{base}/lib/python',
    91 - 'platlib': '{base}/lib/python',
    92 + 'stdlib': '{installed_base}/lib64/python',
    93 + 'platstdlib': '{base}/lib64/python',
    94 + 'purelib': '{base}/lib64/python',
    95 + 'platlib': '{base}/lib64/python',
    96 'include': '{installed_base}/include/python',
    97 'platinclude': '{installed_base}/include/python',
    98 'scripts': '{base}/bin',
    99 @@ -61,10 +61,10 @@
    100 'data': '{userbase}',
    101 },
    102 'posix_user': {
    103 - 'stdlib': '{userbase}/lib/python{py_version_short}',
    104 - 'platstdlib': '{userbase}/lib/python{py_version_short}',
    105 - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
    106 - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
    107 + 'stdlib': '{userbase}/lib64/python{py_version_short}',
    108 + 'platstdlib': '{userbase}/lib64/python{py_version_short}',
    109 + 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages',
    110 + 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
    111 'include': '{userbase}/include/python{py_version_short}',
    112 'scripts': '{userbase}/bin',
    113 'data': '{userbase}',
    114 diff -Naur Python-3.6.5/Lib/test/test_site.py Python-3.6.5-lib64/Lib/test/test_site.py
    115 --- Python-3.6.5/Lib/test/test_site.py 2018-03-28 11:19:31.000000000 +0200
    116 +++ Python-3.6.5-lib64/Lib/test/test_site.py 2018-04-26 10:31:11.163063622 +0200
    117 @@ -260,8 +260,8 @@
    118 self.assertEqual(dirs[1], wanted)
    119 elif os.sep == '/':
    120 # OS X non-framework builds, Linux, FreeBSD, etc
    121 - self.assertEqual(len(dirs), 1)
    122 - wanted = os.path.join('xoxo', 'lib',
    123 + self.assertEqual(len(dirs), 2)
    124 + wanted = os.path.join('xoxo', 'lib64',
    125 'python%d.%d' % sys.version_info[:2],
    126 'site-packages')
    127 self.assertEqual(dirs[0], wanted)
    128 @@ -269,7 +269,7 @@
    129 # other platforms
    130 self.assertEqual(len(dirs), 2)
    131 self.assertEqual(dirs[0], 'xoxo')
    132 - wanted = os.path.join('xoxo', 'lib', 'site-packages')
    133 + wanted = os.path.join('xoxo', 'lib64', 'site-packages')
    134 self.assertEqual(dirs[1], wanted)
    135
    136 class PthFile(object):
    137 diff -Naur Python-3.6.5/Makefile.pre.in Python-3.6.5-lib64/Makefile.pre.in
    138 --- Python-3.6.5/Makefile.pre.in 2018-03-28 11:19:31.000000000 +0200
    139 +++ Python-3.6.5-lib64/Makefile.pre.in 2018-04-26 10:31:58.029449879 +0200
    140 @@ -133,7 +133,7 @@
    141 MANDIR= @mandir@
    142 INCLUDEDIR= @includedir@
    143 CONFINCLUDEDIR= $(exec_prefix)/include
    144 -SCRIPTDIR= $(prefix)/lib
    145 +SCRIPTDIR= $(prefix)/lib64
    146 ABIFLAGS= @ABIFLAGS@
    147
    148 # Detailed destination directories
    149 @@ -1411,7 +1411,7 @@
    150
    151 # Install the library and miscellaneous stuff needed for extending/embedding
    152 # This goes into $(exec_prefix)
    153 -LIBPL= @LIBPL@
    154 +LIBPL= $(LIBDEST)/config-$(LDVERSION)-$(MULTIARCH)
    155
    156 # pkgconfig directory
    157 LIBPC= $(LIBDIR)/pkgconfig
    158 diff -Naur Python-3.6.5/Modules/getpath.c Python-3.6.5-lib64/Modules/getpath.c
    159 --- Python-3.6.5/Modules/getpath.c 2018-03-28 11:19:31.000000000 +0200
    160 +++ Python-3.6.5-lib64/Modules/getpath.c 2018-04-26 10:32:49.119780822 +0200
    161 @@ -494,7 +494,7 @@
    162 _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL);
    163 _prefix = Py_DecodeLocale(PREFIX, NULL);
    164 _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL);
    165 - lib_python = Py_DecodeLocale("lib/python" VERSION, NULL);
    166 + lib_python = Py_DecodeLocale("lib64/python" VERSION, NULL);
    167
    168 if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
    169 Py_FatalError(
    170 @@ -683,7 +683,7 @@
    171 }
    172 else
    173 wcsncpy(zip_path, _prefix, MAXPATHLEN);
    174 - joinpath(zip_path, L"lib/python00.zip");
    175 + joinpath(zip_path, L"lib64/python00.zip");
    176 bufsz = wcslen(zip_path); /* Replace "00" with version */
    177 zip_path[bufsz - 6] = VERSION[0];
    178 zip_path[bufsz - 5] = VERSION[2];
    179 @@ -695,7 +695,7 @@
    180 fprintf(stderr,
    181 "Could not find platform dependent libraries <exec_prefix>\n");
    182 wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
    183 - joinpath(exec_prefix, L"lib/lib-dynload");
    184 + joinpath(exec_prefix, L"lib64/lib-dynload");
    185 }
    186 /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
    187
    188 diff -Naur Python-3.6.5/Modules/Setup.dist Python-3.6.5-lib64/Modules/Setup.dist
    189 --- Python-3.6.5/Modules/Setup.dist 2018-03-28 11:19:31.000000000 +0200
    190 +++ Python-3.6.5-lib64/Modules/Setup.dist 2018-04-26 10:34:07.718751522 +0200
    191 @@ -209,7 +209,7 @@
    192 #SSL=/usr/local/ssl
    193 #_ssl _ssl.c \
    194 # -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
    195 -# -L$(SSL)/lib -lssl -lcrypto
    196 +# -L$(SSL)/lib64 -lssl -lcrypto
    197
    198 # The crypt module is now disabled by default because it breaks builds
    199 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
    200 @@ -288,7 +288,7 @@
    201 # *** Uncomment and edit to reflect your Tcl/Tk versions:
    202 # -ltk8.2 -ltcl8.2 \
    203 # *** Uncomment and edit to reflect where your X11 libraries are:
    204 -# -L/usr/X11R6/lib \
    205 +# -L/usr/X11R6/lib64 \
    206 # *** Or uncomment this for Solaris:
    207 # -L/usr/openwin/lib \
    208 # *** Uncomment these for TOGL extension only:
    209 @@ -333,7 +333,7 @@
    210 #
    211 # First, look at Setup.config; configure may have set this for you.
    212
    213 -#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
    214 +#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib64 -lgdbm
    215
    216
    217 # Helper module for various ascii-encoders
    218 @@ -363,7 +363,7 @@
    219 # Andrew Kuchling's zlib module.
    220 # This require zlib 1.1.3 (or later).
    221 # See http://www.gzip.org/zlib/
    222 -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
    223 +#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
    224
    225 # Interface to the Expat XML parser
    226 #
    227 diff -Naur Python-3.6.5/setup.py Python-3.6.5-lib64/setup.py
    228 --- Python-3.6.5/setup.py 2018-03-28 11:19:31.000000000 +0200
    229 +++ Python-3.6.5-lib64/setup.py 2018-04-26 11:22:42.227584272 +0200
    230 @@ -516,7 +516,7 @@
    231 # directories (i.e. '.' and 'Include') must be first. See issue
    232 # 10520.
    233 if not cross_compiling:
    234 - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
    235 + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
    236 add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
    237 # only change this for cross builds for 3.3, issues on Mageia
    238 if cross_compiling:
    239 @@ -813,11 +813,11 @@
    240 elif curses_library:
    241 readline_libs.append(curses_library)
    242 elif self.compiler.find_library_file(lib_dirs +
    243 - ['/usr/lib/termcap'],
    244 + ['/usr/lib64/termcap'],
    245 'termcap'):
    246 readline_libs.append('termcap')
    247 exts.append( Extension('readline', ['readline.c'],
    248 - library_dirs=['/usr/lib/termcap'],
    249 + library_dirs=['/usr/lib64/termcap'],
    250 extra_link_args=readline_extra_link_args,
    251 libraries=readline_libs) )
    252 else:
    253 @@ -854,8 +854,8 @@
    254 if krb5_h:
    255 ssl_incs += krb5_h
    256 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
    257 - ['/usr/local/ssl/lib',
    258 - '/usr/contrib/ssl/lib/'
    259 + ['/usr/local/ssl/lib64',
    260 + '/usr/contrib/ssl/lib64/'
    261 ] )
    262
    263 if (ssl_incs is not None and
    264 @@ -1877,7 +1877,7 @@
    265 else:
    266 # Assume default location for X11
    267 include_dirs.append('/usr/X11/include')
    268 - added_lib_dirs.append('/usr/X11/lib')
    269 + added_lib_dirs.append('/usr/X11/lib64')
    270
    271 # If Cygwin, then verify that X is installed before proceeding
    272 if host_platform == 'cygwin':