damien
/
slackbuilds
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

d/python3: Upgraded to python3-3.5.2.

slackware-14.2
Damien Goutte-Gattat 6 years ago
parent
46a1a6f082
commit
bb70b59847
6 changed files with 82 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      d/python3/Python-3.3.3.tar.xz.sha1
  2. 1
      d/python3/Python-3.5.2.tar.xz.sha1
  3. 1
      d/python3/python-3.3.3-docs-html.tar.bz2.sha1
  4. 1
      d/python3/python-3.5.0a3-docs-html.tar.bz2.sha1
  5. 20
      d/python3/python3.SlackBuild
  6. 131
      d/python3/python3.x86_64.diff

1
d/python3/Python-3.3.3.tar.xz.sha1
Unescape View File

@ -1 +0,0 @@
af4e75a34bd538c79b9871227c2e7f56569ac107 Python-3.3.3.tar.xz

1
d/python3/Python-3.5.2.tar.xz.sha1
Unescape View File

@ -0,0 +1 @@
4843aabacec5bc0cdd3e1f778faa926e532794d2 Python-3.5.2.tar.xz

1
d/python3/python-3.3.3-docs-html.tar.bz2.sha1
Unescape View File

@ -1 +0,0 @@
bcd1f17d3d32f59288eda50aa6432135394b5ab5 python-3.3.3-docs-html.tar.bz2

1
d/python3/python-3.5.0a3-docs-html.tar.bz2.sha1
Unescape View File

@ -0,0 +1 @@
44e198e3c29435e9df9971b10d95c3153285b872 python-3.5.0a3-docs-html.tar.bz2

20
d/python3/python3.SlackBuild
Unescape View File

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2012,2013 Damien Goutte-Gattat
# Copyright (C) 2012,2013,2016 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -26,11 +26,11 @@
# Source package infos
NAMESRC=${NAMESRC:-Python}
VERSION=${VERSION:-3.3.3}
VERSION=${VERSION:-3.5.2}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.xz}
WGET=${WGET:-http://python.org/ftp/python/$VERSION/$ARCHIVE}
DOC_ARCHIVE=${DOC_ARCHIVE:-python-$VERSION-docs-html.tar.bz2}
DOC_WGET=${DOC_WGET:-http://python.org/ftp/python/doc/$VERSION/$DOC_ARCHIVE}
DOC_ARCHIVE=${DOC_ARCHIVE:-python-3.5.0a3-docs-html.tar.bz2}
DOC_WGET=${DOC_WGET:-http://python.org/ftp/python/doc/3.5.0/$DOC_ARCHIVE}
# Build infos
NAMEPKG=${NAMEPKG:-python3}
@ -100,22 +100,22 @@ find $PKG | xargs file | grep "ELF \(32\|64\)-bit LSB" | cut -d : -f 1 | \
find $PKG/usr/man -type f -exec gzip -9 {} \;
# Install python-tools
cp -a Tools/* $PKG/usr/lib$LIBDIRSUFFIX/python3.3/site-packages/
cp -a Tools/* $PKG/usr/lib$LIBDIRSUFFIX/python3.5/site-packages/
# Create symlinls
( cd $PKG/usr/bin
ln -sf python3.3 python3
ln -sf python3.3*-config python3.3-config
ln -sf pydoc3.3 pydoc3
ln -sf python3.5 python3
ln -sf python3.5*-config python3.3-config
ln -sf pydoc3.5 pydoc3
)
# Install the documentation
mkdir -p $PKG/usr/doc/$NAMEPKG-$VERSION
install -m 644 LICENSE README $PKG/usr/doc/$NAMEPKG-$VERSION
( cd $PKG/usr/doc/$NAMEPKG-$VERSION/
mv $PKG/usr/lib$LIBDIRSUFFIX/python3.3/site-packages/README README.python-tools
mv $PKG/usr/lib$LIBDIRSUFFIX/python3.5/site-packages/README README.python-tools
tar xf $CWD/$DOC_ARCHIVE
mv python-$VERSION-docs-html html
mv python-3.5.0a3-docs-html html
)
# Copy slack-desc file

131
d/python3/python3.x86_64.diff
Unescape View File

@ -1,7 +1,7 @@
diff -Naur Python-3.3.3.orig/Lib/distutils/command/install.py Python-3.3.3/Lib/distutils/command/install.py
--- Python-3.3.3.orig/Lib/distutils/command/install.py 2013-11-17 08:22:30.000000000 +0100
+++ Python-3.3.3/Lib/distutils/command/install.py 2013-11-30 17:01:40.267266499 +0100
@@ -44,15 +44,15 @@
diff -uar Python-3.5.1.orig/Lib/distutils/command/install.py Python-3.5.1/Lib/distutils/command/install.py
--- Python-3.5.1.orig/Lib/distutils/command/install.py 2015-12-07 03:39:07.000000000 +0200
+++ Python-3.5.1/Lib/distutils/command/install.py 2015-12-14 21:27:46.083400395 +0200
@@ -29,15 +29,15 @@
INSTALL_SCHEMES = {
'unix_prefix': {
@ -21,10 +21,10 @@ diff -Naur Python-3.3.3.orig/Lib/distutils/command/install.py Python-3.3.3/Lib/d
'headers': '$base/include/python/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
diff -Naur Python-3.3.3.orig/Lib/distutils/sysconfig.py Python-3.3.3/Lib/distutils/sysconfig.py
--- Python-3.3.3.orig/Lib/distutils/sysconfig.py 2013-11-17 08:22:30.000000000 +0100
+++ Python-3.3.3/Lib/distutils/sysconfig.py 2013-11-30 17:02:10.772930208 +0100
@@ -144,7 +144,7 @@
diff -uar Python-3.5.1.orig/Lib/distutils/sysconfig.py Python-3.5.1/Lib/distutils/sysconfig.py
--- Python-3.5.1.orig/Lib/distutils/sysconfig.py 2015-12-07 03:39:07.000000000 +0200
+++ Python-3.5.1/Lib/distutils/sysconfig.py 2015-12-14 21:27:46.083400395 +0200
@@ -133,7 +133,7 @@
if os.name == "posix":
libpython = os.path.join(prefix,
@ -33,29 +33,22 @@ diff -Naur Python-3.3.3.orig/Lib/distutils/sysconfig.py Python-3.3.3/Lib/distuti
if standard_lib:
return libpython
else:
diff -Naur Python-3.3.3.orig/Lib/site.py Python-3.3.3/Lib/site.py
--- Python-3.3.3.orig/Lib/site.py 2013-11-17 08:22:38.000000000 +0100
+++ Python-3.3.3/Lib/site.py 2013-11-30 17:03:00.468382082 +0100
@@ -303,13 +303,13 @@
if sys.platform in ('os2emx', 'riscos'):
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
elif os.sep == '/':
diff -uar Python-3.5.1.orig/Lib/site.py Python-3.5.1/Lib/site.py
--- Python-3.5.1.orig/Lib/site.py 2015-12-07 03:39:08.000000000 +0200
+++ Python-3.5.1/Lib/site.py 2015-12-14 21:27:46.083400395 +0200
@@ -303,7 +303,7 @@
seen.add(prefix)
if 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"))
else:
sitepackages.append(prefix)
- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
# locations.
diff -Naur Python-3.3.3.orig/Lib/sysconfig.py Python-3.3.3/Lib/sysconfig.py
--- Python-3.3.3.orig/Lib/sysconfig.py 2013-11-17 08:22:39.000000000 +0100
+++ Python-3.3.3/Lib/sysconfig.py 2013-11-30 17:04:12.988592243 +0100
@@ -21,10 +21,10 @@
diff -uar Python-3.5.1.orig/Lib/sysconfig.py Python-3.5.1/Lib/sysconfig.py
--- Python-3.5.1.orig/Lib/sysconfig.py 2015-12-07 03:39:08.000000000 +0200
+++ Python-3.5.1/Lib/sysconfig.py 2015-12-14 21:27:46.084400429 +0200
@@ -20,10 +20,10 @@
_INSTALL_SCHEMES = {
'posix_prefix': {
@ -70,7 +63,7 @@ diff -Naur Python-3.3.3.orig/Lib/sysconfig.py Python-3.3.3/Lib/sysconfig.py
'include':
'{installed_base}/include/python{py_version_short}{abiflags}',
'platinclude':
@@ -33,10 +33,10 @@
@@ -32,10 +32,10 @@
'data': '{base}',
},
'posix_home': {
@ -85,10 +78,25 @@ diff -Naur Python-3.3.3.orig/Lib/sysconfig.py Python-3.3.3/Lib/sysconfig.py
'include': '{installed_base}/include/python',
'platinclude': '{installed_base}/include/python',
'scripts': '{base}/bin',
diff -Naur Python-3.3.3.orig/Makefile.pre.in Python-3.3.3/Makefile.pre.in
--- Python-3.3.3.orig/Makefile.pre.in 2013-11-17 08:22:55.000000000 +0100
+++ Python-3.3.3/Makefile.pre.in 2013-11-30 17:04:32.170405248 +0100
@@ -115,7 +115,7 @@
@@ -61,10 +61,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}',
diff -uar Python-3.5.1.orig/Makefile.pre.in Python-3.5.1/Makefile.pre.in
--- Python-3.5.1.orig/Makefile.pre.in 2015-12-07 03:39:09.000000000 +0200
+++ Python-3.5.1/Makefile.pre.in 2015-12-14 21:27:46.084400429 +0200
@@ -125,7 +125,7 @@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
@ -97,30 +105,19 @@ diff -Naur Python-3.3.3.orig/Makefile.pre.in Python-3.3.3/Makefile.pre.in
ABIFLAGS= @ABIFLAGS@
# Detailed destination directories
diff -Naur Python-3.3.3.orig/Modules/getpath.c Python-3.3.3/Modules/getpath.c
--- Python-3.3.3.orig/Modules/getpath.c 2013-11-17 08:23:01.000000000 +0100
+++ Python-3.3.3/Modules/getpath.c 2013-11-30 17:05:23.101906786 +0100
@@ -122,8 +122,8 @@
#endif
#ifndef PYTHONPATH
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
#endif
#ifndef LANDMARK
@@ -135,7 +135,7 @@
static wchar_t progpath[MAXPATHLEN+1];
static wchar_t *module_search_path = NULL;
static int module_search_path_malloced = 0;
-static wchar_t *lib_python = L"lib/python" VERSION;
+static wchar_t *lib_python = L"lib64/python" VERSION;
diff -uar Python-3.5.1.orig/Modules/getpath.c Python-3.5.1/Modules/getpath.c
--- Python-3.5.1.orig/Modules/getpath.c 2015-12-07 03:39:10.000000000 +0200
+++ Python-3.5.1/Modules/getpath.c 2015-12-14 21:27:46.085400463 +0200
@@ -511,7 +511,7 @@
_pythonpath = Py_DecodeLocale(PYTHONPATH, NULL);
_prefix = Py_DecodeLocale(PREFIX, NULL);
_exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL);
- lib_python = Py_DecodeLocale("lib/python" VERSION, NULL);
+ lib_python = Py_DecodeLocale("lib64/python" VERSION, NULL);
static void
reduce(wchar_t *dir)
@@ -685,7 +685,7 @@
if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
Py_FatalError(
@@ -700,7 +700,7 @@
}
else
wcsncpy(zip_path, _prefix, MAXPATHLEN);
@ -129,7 +126,7 @@ diff -Naur Python-3.3.3.orig/Modules/getpath.c Python-3.3.3/Modules/getpath.c
bufsz = wcslen(zip_path); /* Replace "00" with version */
zip_path[bufsz - 6] = VERSION[0];
zip_path[bufsz - 5] = VERSION[2];
@@ -695,7 +695,7 @@
@@ -712,7 +712,7 @@
fprintf(stderr,
"Could not find platform dependent libraries <exec_prefix>\n");
wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
@ -138,10 +135,22 @@ diff -Naur Python-3.3.3.orig/Modules/getpath.c Python-3.3.3/Modules/getpath.c
}
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
diff -Naur Python-3.3.3.orig/setup.py Python-3.3.3/setup.py
--- Python-3.3.3.orig/setup.py 2013-11-17 08:23:09.000000000 +0100
+++ Python-3.3.3/setup.py 2013-11-30 17:06:35.924189376 +0100
@@ -439,7 +439,7 @@
diff -uar Python-3.5.1.orig/configure Python-3.5.1/configure
--- Python-3.5.1.orig/configure 2015-12-07 03:39:11.000000000 +0200
+++ Python-3.5.1/configure 2015-12-14 21:27:46.089400598 +0200
@@ -14464,7 +14464,7 @@
$as_echo "$LDVERSION" >&6; }
-LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
+LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
# Check whether right shifting a negative integer extends the sign bit
diff -uar Python-3.5.1.orig/setup.py Python-3.5.1/setup.py
--- Python-3.5.1.orig/setup.py 2015-12-07 03:39:11.000000000 +0200
+++ Python-3.5.1/setup.py 2015-12-14 21:27:46.090400632 +0200
@@ -469,7 +469,7 @@
# directories (i.e. '.' and 'Include') must be first. See issue
# 10520.
if not cross_compiling:
@ -150,7 +159,7 @@ diff -Naur Python-3.3.3.orig/setup.py Python-3.3.3/setup.py
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
# only change this for cross builds for 3.3, issues on Mageia
if cross_compiling:
@@ -712,11 +712,11 @@
@@ -750,11 +750,11 @@
elif curses_library:
readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
@ -164,7 +173,7 @@ diff -Naur Python-3.3.3.orig/setup.py Python-3.3.3/setup.py
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
@@ -753,8 +753,8 @@
@@ -791,8 +791,8 @@
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,

Write Preview
Loading…
Cancel
Save