mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
72b3c9e90f
d/python-2.7.17-x86_64-2.txz: Removed. d/python2-2.7.18-x86_64-1.txz: Added. OK, I know a few people got excited seeing python-2 removed in the previous entry, but it's just being renamed to python2 for consistency with the python3 package. It's DOA though, and is the final release of the already EOL python 2 branch (a "commemorative" release as they say in the announcement). l/M2Crypto-0.35.2-x86_64-3.txz: Rebuilt. Added python3 modules. Thanks to sombragris and ponce. l/harfbuzz-2.6.5-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_7-x86_64-1.txz: Upgraded. l/libuv-1.37.0-x86_64-1.txz: Upgraded. l/libyaml-0.2.4-x86_64-1.txz: Upgraded. l/oniguruma-6.9.5-x86_64-1.txz: Upgraded. x/pixman-0.40.0-x86_64-1.txz: Upgraded.
174 lines
7.7 KiB
Diff
174 lines
7.7 KiB
Diff
--- ./Makefile.pre.in.orig 2016-12-17 14:05:06.000000000 -0600
|
|
+++ ./Makefile.pre.in 2016-12-28 13:17:09.089663880 -0600
|
|
@@ -111,7 +111,7 @@
|
|
MANDIR= @mandir@
|
|
INCLUDEDIR= @includedir@
|
|
CONFINCLUDEDIR= $(exec_prefix)/include
|
|
-SCRIPTDIR= $(prefix)/lib
|
|
+SCRIPTDIR= $(prefix)/lib64
|
|
|
|
# Detailed destination directories
|
|
BINLIBDEST= $(LIBDIR)/python$(VERSION)
|
|
--- ./Lib/sysconfig.py.orig 2016-12-17 14:05:06.000000000 -0600
|
|
+++ ./Lib/sysconfig.py 2016-12-28 13:17:09.086663880 -0600
|
|
@@ -7,20 +7,20 @@
|
|
|
|
_INSTALL_SCHEMES = {
|
|
'posix_prefix': {
|
|
- 'stdlib': '{base}/lib/python{py_version_short}',
|
|
- 'platstdlib': '{platbase}/lib/python{py_version_short}',
|
|
- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
|
|
- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
|
|
+ 'stdlib': '{base}/lib64/python{py_version_short}',
|
|
+ 'platstdlib': '{platbase}/lib64/python{py_version_short}',
|
|
+ 'purelib': '{base}/lib64/python{py_version_short}/site-packages',
|
|
+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
|
|
'include': '{base}/include/python{py_version_short}',
|
|
'platinclude': '{platbase}/include/python{py_version_short}',
|
|
'scripts': '{base}/bin',
|
|
'data': '{base}',
|
|
},
|
|
'posix_home': {
|
|
- 'stdlib': '{base}/lib/python',
|
|
- 'platstdlib': '{base}/lib/python',
|
|
- 'purelib': '{base}/lib/python',
|
|
- 'platlib': '{base}/lib/python',
|
|
+ 'stdlib': '{base}/lib64/python',
|
|
+ 'platstdlib': '{base}/lib64/python',
|
|
+ 'purelib': '{base}/lib64/python',
|
|
+ 'platlib': '{base}/lib64/python',
|
|
'include': '{base}/include/python',
|
|
'platinclude': '{base}/include/python',
|
|
'scripts': '{base}/bin',
|
|
@@ -65,10 +65,10 @@
|
|
'data' : '{userbase}',
|
|
},
|
|
'posix_user': {
|
|
- 'stdlib': '{userbase}/lib/python{py_version_short}',
|
|
- 'platstdlib': '{userbase}/lib/python{py_version_short}',
|
|
- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
|
|
- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
|
|
+ 'stdlib': '{userbase}/lib64/python{py_version_short}',
|
|
+ 'platstdlib': '{userbase}/lib64/python{py_version_short}',
|
|
+ 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages',
|
|
+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
|
|
'include': '{userbase}/include/python{py_version_short}',
|
|
'scripts': '{userbase}/bin',
|
|
'data' : '{userbase}',
|
|
--- ./Lib/site.py.orig 2016-12-17 14:05:06.000000000 -0600
|
|
+++ ./Lib/site.py 2016-12-28 13:19:06.612662631 -0600
|
|
@@ -288,13 +288,13 @@
|
|
if sys.platform in ('os2emx', 'riscos'):
|
|
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
|
|
elif os.sep == '/':
|
|
- sitepackages.append(os.path.join(prefix, "lib",
|
|
+ sitepackages.append(os.path.join(prefix, "lib64",
|
|
"python" + sys.version[:3],
|
|
"site-packages"))
|
|
- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
|
|
+ sitepackages.append(os.path.join(prefix, "lib64", "site-python"))
|
|
else:
|
|
sitepackages.append(prefix)
|
|
- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
|
|
+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
|
|
return sitepackages
|
|
|
|
def addsitepackages(known_paths):
|
|
--- ./Lib/distutils/command/install.py.orig 2016-12-17 14:05:05.000000000 -0600
|
|
+++ ./Lib/distutils/command/install.py 2016-12-28 13:17:09.079663880 -0600
|
|
@@ -41,15 +41,15 @@
|
|
|
|
INSTALL_SCHEMES = {
|
|
'unix_prefix': {
|
|
- 'purelib': '$base/lib/python$py_version_short/site-packages',
|
|
- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
|
|
+ 'purelib': '$base/lib64/python$py_version_short/site-packages',
|
|
+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
|
|
'headers': '$base/include/python$py_version_short/$dist_name',
|
|
'scripts': '$base/bin',
|
|
'data' : '$base',
|
|
},
|
|
'unix_home': {
|
|
- 'purelib': '$base/lib/python',
|
|
- 'platlib': '$base/lib/python',
|
|
+ 'purelib': '$base/lib64/python',
|
|
+ 'platlib': '$base/lib64/python',
|
|
'headers': '$base/include/python/$dist_name',
|
|
'scripts': '$base/bin',
|
|
'data' : '$base',
|
|
--- ./Lib/distutils/sysconfig.py.orig 2016-12-17 14:05:05.000000000 -0600
|
|
+++ ./Lib/distutils/sysconfig.py 2016-12-28 13:17:09.081663880 -0600
|
|
@@ -120,7 +120,7 @@
|
|
|
|
if os.name == "posix":
|
|
libpython = os.path.join(prefix,
|
|
- "lib", "python" + get_python_version())
|
|
+ "lib64", "python" + get_python_version())
|
|
if standard_lib:
|
|
return libpython
|
|
else:
|
|
--- ./Modules/getpath.c.orig 2016-12-17 14:05:07.000000000 -0600
|
|
+++ ./Modules/getpath.c 2016-12-28 13:17:09.093663880 -0600
|
|
@@ -108,7 +108,7 @@
|
|
static char exec_prefix[MAXPATHLEN+1];
|
|
static char progpath[MAXPATHLEN+1];
|
|
static char *module_search_path = NULL;
|
|
-static char lib_python[] = "lib/python" VERSION;
|
|
+static char lib_python[] = "lib64/python" VERSION;
|
|
|
|
static void
|
|
reduce(char *dir)
|
|
@@ -520,7 +520,7 @@
|
|
}
|
|
else
|
|
strncpy(zip_path, PREFIX, MAXPATHLEN);
|
|
- joinpath(zip_path, "lib/python00.zip");
|
|
+ joinpath(zip_path, "lib64/python00.zip");
|
|
bufsz = strlen(zip_path); /* Replace "00" with version */
|
|
zip_path[bufsz - 6] = VERSION[0];
|
|
zip_path[bufsz - 5] = VERSION[2];
|
|
@@ -530,7 +530,7 @@
|
|
fprintf(stderr,
|
|
"Could not find platform dependent libraries <exec_prefix>\n");
|
|
strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
|
|
- joinpath(exec_prefix, "lib/lib-dynload");
|
|
+ joinpath(exec_prefix, "lib64/lib-dynload");
|
|
}
|
|
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
|
|
|
|
--- ./setup.py.orig 2016-12-17 14:05:07.000000000 -0600
|
|
+++ ./setup.py 2016-12-28 13:17:09.097663880 -0600
|
|
@@ -456,7 +456,7 @@
|
|
def detect_modules(self):
|
|
# Ensure that /usr/local is always used
|
|
if not cross_compiling:
|
|
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
|
+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
|
|
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
|
if cross_compiling:
|
|
self.add_gcc_paths()
|
|
@@ -782,11 +782,11 @@
|
|
elif curses_library:
|
|
readline_libs.append(curses_library)
|
|
elif self.compiler.find_library_file(lib_dirs +
|
|
- ['/usr/lib/termcap'],
|
|
+ ['/usr/lib64/termcap'],
|
|
'termcap'):
|
|
readline_libs.append('termcap')
|
|
exts.append( Extension('readline', ['readline.c'],
|
|
- library_dirs=['/usr/lib/termcap'],
|
|
+ library_dirs=['/usr/lib64/termcap'],
|
|
extra_link_args=readline_extra_link_args,
|
|
libraries=readline_libs) )
|
|
else:
|
|
@@ -821,8 +821,8 @@
|
|
if krb5_h:
|
|
ssl_incs += krb5_h
|
|
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
|
|
- ['/usr/local/ssl/lib',
|
|
- '/usr/contrib/ssl/lib/'
|
|
+ ['/usr/local/ssl/lib64',
|
|
+ '/usr/contrib/ssl/lib64/'
|
|
] )
|
|
|
|
if (ssl_incs is not None and
|