Magellan Linux

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

    Annotation of /trunk/python/patches/python-3.7.1-lib64.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3252 - (hide annotations) (download)
    Thu Nov 22 12:52:34 2018 UTC (5 years, 5 months ago) by niro
    File size: 12368 byte(s) 
    -re-diffed for python-3.7.1
    1 niro 3252 diff -Naur Python-3.7.1/Lib/distutils/command/install.py Python-3.7.1-lib64/Lib/distutils/command/install.py
    2     --- Python-3.7.1/Lib/distutils/command/install.py 2018-10-20 08:04:19.000000000 +0200
    3     +++ Python-3.7.1-lib64/Lib/distutils/command/install.py 2018-11-22 13:38:41.476847374 +0100
    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.7.1/Lib/distutils/sysconfig.py Python-3.7.1-lib64/Lib/distutils/sysconfig.py
    25     --- Python-3.7.1/Lib/distutils/sysconfig.py 2018-10-20 08:04:19.000000000 +0200
    26     +++ Python-3.7.1-lib64/Lib/distutils/sysconfig.py 2018-11-22 13:39:16.907329827 +0100
    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.7.1/Lib/distutils/tests/test_install.py Python-3.7.1-lib64/Lib/distutils/tests/test_install.py
    37     --- Python-3.7.1/Lib/distutils/tests/test_install.py 2018-10-20 08:04:19.000000000 +0200
    38     +++ Python-3.7.1-lib64/Lib/distutils/tests/test_install.py 2018-11-22 13:39:51.724822677 +0100
    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.7.1/Lib/site.py Python-3.7.1-lib64/Lib/site.py
    49     --- Python-3.7.1/Lib/site.py 2018-10-20 08:04:19.000000000 +0200
    50     +++ Python-3.7.1-lib64/Lib/site.py 2018-11-22 13:40:28.182293045 +0100
    51     @@ -334,12 +334,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     return sitepackages
    64    
    65     def addsitepackages(known_paths, prefixes=None):
    66     diff -Naur Python-3.7.1/Lib/sysconfig.py Python-3.7.1-lib64/Lib/sysconfig.py
    67     --- Python-3.7.1/Lib/sysconfig.py 2018-10-20 08:04:19.000000000 +0200
    68     +++ Python-3.7.1-lib64/Lib/sysconfig.py 2018-11-22 13:42:28.262557617 +0100
    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     @@ -62,10 +62,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.7.1/Lib/test/test_site.py Python-3.7.1-lib64/Lib/test/test_site.py
    115     --- Python-3.7.1/Lib/test/test_site.py 2018-10-20 08:04:19.000000000 +0200
    116     +++ Python-3.7.1-lib64/Lib/test/test_site.py 2018-11-22 13:43:53.013339903 +0100
    117     @@ -264,8 +264,8 @@
    118     dirs = site.getsitepackages()
    119     if os.sep == '/':
    120     # OS X, 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     @@ -273,7 +273,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.7.1/Makefile.pre.in Python-3.7.1-lib64/Makefile.pre.in
    138     --- Python-3.7.1/Makefile.pre.in 2018-10-20 08:04:19.000000000 +0200
    139     +++ Python-3.7.1-lib64/Makefile.pre.in 2018-11-22 13:45:15.125164764 +0100
    140     @@ -134,7 +134,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     @@ -1451,7 +1451,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.7.1/Modules/getpath.c Python-3.7.1-lib64/Modules/getpath.c
    159     --- Python-3.7.1/Modules/getpath.c 2018-10-20 08:04:19.000000000 +0200
    160     +++ Python-3.7.1-lib64/Modules/getpath.c 2018-11-22 13:47:23.207339294 +0100
    161     @@ -500,7 +500,7 @@
    162     "Could not find platform dependent libraries <exec_prefix>\n");
    163     }
    164     wcsncpy(exec_prefix, calculate->exec_prefix, MAXPATHLEN);
    165     - joinpath(exec_prefix, L"lib/lib-dynload");
    166     + joinpath(exec_prefix, L"lib64/lib-dynload");
    167     }
    168     /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
    169     }
    170     @@ -742,7 +742,7 @@
    171     else {
    172     wcsncpy(calculate->zip_path, calculate->prefix, MAXPATHLEN);
    173     }
    174     - joinpath(calculate->zip_path, L"lib/python00.zip");
    175     + joinpath(calculate->zip_path, L"lib64/python00.zip");
    176    
    177     /* Replace "00" with version */
    178     size_t bufsz = wcslen(calculate->zip_path);
    179     @@ -867,7 +867,7 @@
    180     if (!calculate->prefix) {
    181     return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
    182     }
    183     - calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);
    184     + calculate->lib_python = Py_DecodeLocale("lib64/python" VERSION, &len);
    185     if (!calculate->lib_python) {
    186     return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
    187     }
    188     diff -Naur Python-3.7.1/Modules/Setup.dist Python-3.7.1-lib64/Modules/Setup.dist
    189     --- Python-3.7.1/Modules/Setup.dist 2018-10-20 08:04:19.000000000 +0200
    190     +++ Python-3.7.1-lib64/Modules/Setup.dist 2018-11-22 13:49:03.448915873 +0100
    191     @@ -211,7 +211,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     @@ -269,7 +269,7 @@
    201     # *** Always uncomment this (leave the leading underscore in!):
    202     # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
    203     # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
    204     -# -L/usr/local/lib \
    205     +# -L/usr/local/lib64 \
    206     # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
    207     # -I/usr/local/include \
    208     # *** Uncomment and edit to reflect where your X11 header files are:
    209     @@ -288,7 +288,7 @@
    210     # *** Uncomment and edit to reflect your Tcl/Tk versions:
    211     # -ltk8.2 -ltcl8.2 \
    212     # *** Uncomment and edit to reflect where your X11 libraries are:
    213     -# -L/usr/X11R6/lib \
    214     +# -L/usr/X11R6/lib64 \
    215     # *** Or uncomment this for Solaris:
    216     # -L/usr/openwin/lib \
    217     # *** Uncomment these for TOGL extension only:
    218     @@ -322,7 +322,7 @@
    219    
    220     # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
    221    
    222     -#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
    223     +#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib64 -lgdbm
    224    
    225    
    226     # Helper module for various ascii-encoders
    227     @@ -335,7 +335,7 @@
    228     # Andrew Kuchling's zlib module.
    229     # This require zlib 1.1.3 (or later).
    230     # See http://www.gzip.org/zlib/
    231     -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
    232     +#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
    233    
    234     # Interface to the Expat XML parser
    235     # More information on Expat can be found at www.libexpat.org.
    236     diff -Naur Python-3.7.1/setup.py Python-3.7.1-lib64/setup.py
    237     --- Python-3.7.1/setup.py 2018-10-20 08:04:19.000000000 +0200
    238     +++ Python-3.7.1-lib64/setup.py 2018-11-22 13:51:43.031657210 +0100
    239     @@ -541,7 +541,7 @@
    240     # directories (i.e. '.' and 'Include') must be first. See issue
    241     # 10520.
    242     if not cross_compiling:
    243     - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
    244     + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
    245     add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
    246     # only change this for cross builds for 3.3, issues on Mageia
    247     if cross_compiling:
    248     @@ -847,11 +847,11 @@
    249     elif curses_library:
    250     readline_libs.append(curses_library)
    251     elif self.compiler.find_library_file(lib_dirs +
    252     - ['/usr/lib/termcap'],
    253     + ['/usr/lib64/termcap'],
    254     'termcap'):
    255     readline_libs.append('termcap')
    256     exts.append( Extension('readline', ['readline.c'],
    257     - library_dirs=['/usr/lib/termcap'],
    258     + library_dirs=['/usr/lib64/termcap'],
    259     extra_link_args=readline_extra_link_args,
    260     libraries=readline_libs) )
    261     else:
    262     @@ -1847,7 +1847,7 @@
    263     else:
    264     # Assume default location for X11
    265     include_dirs.append('/usr/X11/include')
    266     - added_lib_dirs.append('/usr/X11/lib')
    267     + added_lib_dirs.append('/usr/X11/lib64')
    268    
    269     # If Cygwin, then verify that X is installed before proceeding
    270     if host_platform == 'cygwin':