Magellan Linux

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

    Annotation of /trunk/python/patches/python-2.7.0-lib64-3.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1096 - (hide annotations) (download)
    Thu Aug 19 16:31:28 2010 UTC (13 years, 9 months ago) by niro
    File size: 9584 byte(s) 
    -fixed new Lib/sysconfig.py too
    1 niro 1096 diff -Naur Python-2.7/Lib/distutils/command/install.py Python-2.7-magellan/Lib/distutils/command/install.py
    2     --- Python-2.7/Lib/distutils/command/install.py 2010-05-05 21:09:31.000000000 +0200
    3     +++ Python-2.7-magellan/Lib/distutils/command/install.py 2010-08-19 18:40:14.000000000 +0200
    4     @@ -42,14 +42,14 @@
    5     INSTALL_SCHEMES = {
    6     'unix_prefix': {
    7     'purelib': '$base/lib/python$py_version_short/site-packages',
    8     - 'platlib': '$platbase/lib/python$py_version_short/site-packages',
    9     + 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
    10     'headers': '$base/include/python$py_version_short/$dist_name',
    11     'scripts': '$base/bin',
    12     'data' : '$base',
    13     },
    14     'unix_home': {
    15     'purelib': '$base/lib/python',
    16     - 'platlib': '$base/lib/python',
    17     + 'platlib': '$base/lib64/python',
    18     'headers': '$base/include/python/$dist_name',
    19     'scripts': '$base/bin',
    20     'data' : '$base',
    21     diff -Naur Python-2.7/Lib/distutils/sysconfig.py Python-2.7-magellan/Lib/distutils/sysconfig.py
    22     --- Python-2.7/Lib/distutils/sysconfig.py 2010-05-05 21:09:31.000000000 +0200
    23     +++ Python-2.7-magellan/Lib/distutils/sysconfig.py 2010-08-19 18:40:14.000000000 +0200
    24     @@ -114,8 +114,12 @@
    25     prefix = plat_specific and EXEC_PREFIX or PREFIX
    26    
    27     if os.name == "posix":
    28     + if plat_specific or standard_lib:
    29     + lib = "lib64"
    30     + else:
    31     + lib = "lib"
    32     libpython = os.path.join(prefix,
    33     - "lib", "python" + get_python_version())
    34     + lib, "python" + get_python_version())
    35     if standard_lib:
    36     return libpython
    37     else:
    38     diff -Naur Python-2.7/Lib/site.py Python-2.7-magellan/Lib/site.py
    39     --- Python-2.7/Lib/site.py 2010-06-03 23:21:03.000000000 +0200
    40     +++ Python-2.7-magellan/Lib/site.py 2010-08-19 18:40:14.000000000 +0200
    41     @@ -286,12 +286,16 @@
    42     if sys.platform in ('os2emx', 'riscos'):
    43     sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
    44     elif os.sep == '/':
    45     + sitepackages.append(os.path.join(prefix, "lib64",
    46     + "python" + sys.version[:3],
    47     + "site-packages"))
    48     sitepackages.append(os.path.join(prefix, "lib",
    49     "python" + sys.version[:3],
    50     "site-packages"))
    51     sitepackages.append(os.path.join(prefix, "lib", "site-python"))
    52     else:
    53     sitepackages.append(prefix)
    54     + sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
    55     sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
    56     if sys.platform == "darwin":
    57     # for framework builds *only* we add the standard Apple
    58     diff -Naur Python-2.7/Lib/sysconfig.py Python-2.7-magellan/Lib/sysconfig.py
    59     --- Python-2.7/Lib/sysconfig.py 2010-05-20 00:20:14.000000000 +0200
    60     +++ Python-2.7-magellan/Lib/sysconfig.py 2010-08-19 18:41:13.000000000 +0200
    61     @@ -7,20 +7,20 @@
    62    
    63     _INSTALL_SCHEMES = {
    64     'posix_prefix': {
    65     - 'stdlib': '{base}/lib/python{py_version_short}',
    66     - 'platstdlib': '{platbase}/lib/python{py_version_short}',
    67     + 'stdlib': '{base}/lib64/python{py_version_short}',
    68     + 'platstdlib': '{platbase}/lib64/python{py_version_short}',
    69     'purelib': '{base}/lib/python{py_version_short}/site-packages',
    70     - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
    71     + 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
    72     'include': '{base}/include/python{py_version_short}',
    73     'platinclude': '{platbase}/include/python{py_version_short}',
    74     'scripts': '{base}/bin',
    75     'data': '{base}',
    76     },
    77     'posix_home': {
    78     - 'stdlib': '{base}/lib/python',
    79     - 'platstdlib': '{base}/lib/python',
    80     + 'stdlib': '{base}/lib64/python',
    81     + 'platstdlib': '{base}/lib64/python',
    82     'purelib': '{base}/lib/python',
    83     - 'platlib': '{base}/lib/python',
    84     + 'platlib': '{base}/lib64/python',
    85     'include': '{base}/include/python',
    86     'platinclude': '{base}/include/python',
    87     'scripts': '{base}/bin',
    88     @@ -65,10 +65,10 @@
    89     'data' : '{userbase}',
    90     },
    91     'posix_user': {
    92     - 'stdlib': '{userbase}/lib/python{py_version_short}',
    93     - 'platstdlib': '{userbase}/lib/python{py_version_short}',
    94     + 'stdlib': '{userbase}/lib64/python{py_version_short}',
    95     + 'platstdlib': '{userbase}/lib64/python{py_version_short}',
    96     'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
    97     - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
    98     + 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
    99     'include': '{userbase}/include/python{py_version_short}',
    100     'scripts': '{userbase}/bin',
    101     'data' : '{userbase}',
    102     diff -Naur Python-2.7/Makefile.pre.in Python-2.7-magellan/Makefile.pre.in
    103     --- Python-2.7/Makefile.pre.in 2010-04-12 02:10:46.000000000 +0200
    104     +++ Python-2.7-magellan/Makefile.pre.in 2010-08-19 18:40:14.000000000 +0200
    105     @@ -94,7 +94,7 @@
    106     MANDIR= @mandir@
    107     INCLUDEDIR= @includedir@
    108     CONFINCLUDEDIR= $(exec_prefix)/include
    109     -SCRIPTDIR= $(prefix)/lib
    110     +SCRIPTDIR= $(prefix)/lib64
    111    
    112     # Detailed destination directories
    113     BINLIBDEST= $(LIBDIR)/python$(VERSION)
    114     diff -Naur Python-2.7/Modules/getpath.c Python-2.7-magellan/Modules/getpath.c
    115     --- Python-2.7/Modules/getpath.c 2010-05-09 16:46:46.000000000 +0200
    116     +++ Python-2.7-magellan/Modules/getpath.c 2010-08-19 18:40:14.000000000 +0200
    117     @@ -117,8 +117,8 @@
    118     #endif
    119    
    120     #ifndef PYTHONPATH
    121     -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
    122     - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
    123     +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
    124     + EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
    125     #endif
    126    
    127     #ifndef LANDMARK
    128     @@ -129,7 +129,7 @@
    129     static char exec_prefix[MAXPATHLEN+1];
    130     static char progpath[MAXPATHLEN+1];
    131     static char *module_search_path = NULL;
    132     -static char lib_python[] = "lib/python" VERSION;
    133     +static char lib_python[] = "lib64/python" VERSION;
    134    
    135     static void
    136     reduce(char *dir)
    137     @@ -524,7 +524,7 @@
    138     }
    139     else
    140     strncpy(zip_path, PREFIX, MAXPATHLEN);
    141     - joinpath(zip_path, "lib/python00.zip");
    142     + joinpath(zip_path, "lib64/python00.zip");
    143     bufsz = strlen(zip_path); /* Replace "00" with version */
    144     zip_path[bufsz - 6] = VERSION[0];
    145     zip_path[bufsz - 5] = VERSION[2];
    146     @@ -534,7 +534,7 @@
    147     fprintf(stderr,
    148     "Could not find platform dependent libraries <exec_prefix>\n");
    149     strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
    150     - joinpath(exec_prefix, "lib/lib-dynload");
    151     + joinpath(exec_prefix, "lib64/lib-dynload");
    152     }
    153     /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
    154    
    155     diff -Naur Python-2.7/Modules/Setup.dist Python-2.7-magellan/Modules/Setup.dist
    156     --- Python-2.7/Modules/Setup.dist 2009-12-21 16:22:00.000000000 +0100
    157     +++ Python-2.7-magellan/Modules/Setup.dist 2010-08-19 18:40:14.000000000 +0200
    158     @@ -414,7 +414,7 @@
    159     #DB=/usr/local/BerkeleyDB.4.0
    160     #DBLIBVER=4.0
    161     #DBINC=$(DB)/include
    162     -#DBLIB=$(DB)/lib
    163     +#DBLIB=$(DB)/lib64
    164     #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
    165    
    166     # Historical Berkeley DB 1.85
    167     @@ -460,7 +460,7 @@
    168     # Andrew Kuchling's zlib module.
    169     # This require zlib 1.1.3 (or later).
    170     # See http://www.gzip.org/zlib/
    171     -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
    172     +#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
    173    
    174     # Interface to the Expat XML parser
    175     #
    176     diff -Naur Python-2.7/setup.py Python-2.7-magellan/setup.py
    177     --- Python-2.7/setup.py 2010-06-27 14:36:16.000000000 +0200
    178     +++ Python-2.7-magellan/setup.py 2010-08-19 18:40:14.000000000 +0200
    179     @@ -347,7 +347,7 @@
    180    
    181     def detect_modules(self):
    182     # Ensure that /usr/local is always used
    183     - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
    184     + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
    185     add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
    186    
    187     # Add paths specified in the environment variables LDFLAGS and
    188     @@ -643,11 +643,11 @@
    189     elif curses_library:
    190     readline_libs.append(curses_library)
    191     elif self.compiler.find_library_file(lib_dirs +
    192     - ['/usr/lib/termcap'],
    193     + ['/usr/lib64/termcap'],
    194     'termcap'):
    195     readline_libs.append('termcap')
    196     exts.append( Extension('readline', ['readline.c'],
    197     - library_dirs=['/usr/lib/termcap'],
    198     + library_dirs=['/usr/lib64/termcap'],
    199     extra_link_args=readline_extra_link_args,
    200     libraries=readline_libs) )
    201     else:
    202     @@ -681,8 +681,8 @@
    203     if krb5_h:
    204     ssl_incs += krb5_h
    205     ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
    206     - ['/usr/local/ssl/lib',
    207     - '/usr/contrib/ssl/lib/'
    208     + ['/usr/local/ssl/lib64',
    209     + '/usr/contrib/ssl/lib64/'
    210     ] )
    211    
    212     if (ssl_incs is not None and