Browse Source

d/python3: Upgraded to python3-3.3.3.

slackware-14.2
Damien Goutte-Gattat 8 years ago
parent
commit
1e8048cb11
  1. 1
      d/python3/Python-3.2.3.tar.xz.sha1
  2. 1
      d/python3/Python-3.3.3.tar.xz.sha1
  3. 1
      d/python3/python-3.2.3-docs-html.tar.bz2.sha1
  4. 1
      d/python3/python-3.3.3-docs-html.tar.bz2.sha1
  5. 15
      d/python3/python3.SlackBuild
  6. 12
      d/python3/python3.readline.set_pre_input_hook.diff
  7. 84
      d/python3/python3.x86_64.diff

1
d/python3/Python-3.2.3.tar.xz.sha1

@ -1 +0,0 @@
3d607dbcfdf100dd659978195ccf3ade9d221823 Python-3.2.3.tar.xz

1
d/python3/Python-3.3.3.tar.xz.sha1

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

1
d/python3/python-3.2.3-docs-html.tar.bz2.sha1

@ -1 +0,0 @@
3d474a03fef9861d9897a987eb6a28c129833fd9 python-3.2.3-docs-html.tar.bz2

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

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

15
d/python3/python3.SlackBuild

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2012 Damien Goutte-Gattat
# Copyright (C) 2012,2013 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -26,7 +26,7 @@
# Source package infos
NAMESRC=${NAMESRC:-Python}
VERSION=${VERSION:-3.2.3}
VERSION=${VERSION:-3.3.3}
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}
@ -74,7 +74,6 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
patch -p1 < $CWD/python3.readline.set_pre_input_hook.diff
LIBDIRSUFFIX=""
if [ "x$ARCH" = xx86_64 ]; then
LIBDIRSUFFIX="64"
@ -101,20 +100,20 @@ 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.2/site-packages/
cp -a Tools/* $PKG/usr/lib$LIBDIRSUFFIX/python3.3/site-packages/
# Create symlinls
( cd $PKG/usr/bin
ln -sf python3.2 python3
ln -sf python3.2*-config python3.2-config
ln -sf pydoc3.2 pydoc3
ln -sf python3.3 python3
ln -sf python3.3*-config python3.3-config
ln -sf pydoc3.3 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.2/site-packages/README README.python-tools
mv $PKG/usr/lib$LIBDIRSUFFIX/python3.3/site-packages/README README.python-tools
tar xf $CWD/$DOC_ARCHIVE
mv python-$VERSION-docs-html html
)

12
d/python3/python3.readline.set_pre_input_hook.diff

@ -1,12 +0,0 @@
--- ./Modules/readline.c.orig 2009-10-26 21:32:51.000000000 +0200
+++ ./Modules/readline.c 2010-05-30 14:07:10.000000000 +0300
@@ -11,6 +11,9 @@
#include <errno.h>
#include <sys/time.h>
+/* This seems to be needed for set_pre_input_hook to work */
+#define HAVE_RL_PRE_INPUT_HOOK 1
+
#if defined(HAVE_SETLOCALE)
/* GNU readline() mistakenly sets the LC_CTYPE locale.
* This is evil. Only the user or the app's main() should do this!

84
d/python3/python3.x86_64.diff

@ -1,6 +1,6 @@
diff -uar Python-3.2.2.orig/Lib/distutils/command/install.py Python-3.2.2/Lib/distutils/command/install.py
--- Python-3.2.2.orig/Lib/distutils/command/install.py 2011-09-03 19:16:40.000000000 +0300
+++ Python-3.2.2/Lib/distutils/command/install.py 2011-09-05 23:16:30.986061070 +0300
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 @@
INSTALL_SCHEMES = {
@ -21,10 +21,10 @@ diff -uar Python-3.2.2.orig/Lib/distutils/command/install.py Python-3.2.2/Lib/di
'headers': '$base/include/python/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
diff -uar Python-3.2.2.orig/Lib/distutils/sysconfig.py Python-3.2.2/Lib/distutils/sysconfig.py
--- Python-3.2.2.orig/Lib/distutils/sysconfig.py 2011-09-03 19:16:40.000000000 +0300
+++ Python-3.2.2/Lib/distutils/sysconfig.py 2011-09-05 23:16:30.986061070 +0300
@@ -123,7 +123,7 @@
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 @@
if os.name == "posix":
libpython = os.path.join(prefix,
@ -33,10 +33,10 @@ diff -uar Python-3.2.2.orig/Lib/distutils/sysconfig.py Python-3.2.2/Lib/distutil
if standard_lib:
return libpython
else:
diff -uar Python-3.2.2.orig/Lib/site.py Python-3.2.2/Lib/site.py
--- Python-3.2.2.orig/Lib/site.py 2011-09-03 19:16:42.000000000 +0300
+++ Python-3.2.2/Lib/site.py 2011-09-05 23:16:30.986061070 +0300
@@ -285,13 +285,13 @@
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 == '/':
@ -52,43 +52,43 @@ diff -uar Python-3.2.2.orig/Lib/site.py Python-3.2.2/Lib/site.py
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
# locations.
diff -uar Python-3.2.2.orig/Lib/sysconfig.py Python-3.2.2/Lib/sysconfig.py
--- Python-3.2.2.orig/Lib/sysconfig.py 2011-09-03 19:16:42.000000000 +0300
+++ Python-3.2.2/Lib/sysconfig.py 2011-09-05 23:16:30.994061003 +0300
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 @@
_INSTALL_SCHEMES = {
'posix_prefix': {
- 'stdlib': '{base}/lib/python{py_version_short}',
- 'stdlib': '{installed_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}',
+ 'stdlib': '{installed_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}{abiflags}',
'{installed_base}/include/python{py_version_short}{abiflags}',
'platinclude':
@@ -33,10 +33,10 @@
'data': '{base}',
},
'posix_home': {
- 'stdlib': '{base}/lib/python',
- 'stdlib': '{installed_base}/lib/python',
- 'platstdlib': '{base}/lib/python',
- 'purelib': '{base}/lib/python',
- 'platlib': '{base}/lib/python',
+ 'stdlib': '{base}/lib64/python',
+ 'stdlib': '{installed_base}/lib64/python',
+ 'platstdlib': '{base}/lib64/python',
+ 'purelib': '{base}/lib64/python',
+ 'platlib': '{base}/lib64/python',
'include': '{base}/include/python',
'platinclude': '{base}/include/python',
'include': '{installed_base}/include/python',
'platinclude': '{installed_base}/include/python',
'scripts': '{base}/bin',
diff -uar Python-3.2.2.orig/Makefile.pre.in Python-3.2.2/Makefile.pre.in
--- Python-3.2.2.orig/Makefile.pre.in 2011-09-03 19:16:45.000000000 +0300
+++ Python-3.2.2/Makefile.pre.in 2011-09-05 23:16:30.994061003 +0300
@@ -106,7 +106,7 @@
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 @@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
@ -97,9 +97,9 @@ diff -uar Python-3.2.2.orig/Makefile.pre.in Python-3.2.2/Makefile.pre.in
ABIFLAGS= @ABIFLAGS@
# Detailed destination directories
diff -uar Python-3.2.2.orig/Modules/getpath.c Python-3.2.2/Modules/getpath.c
--- Python-3.2.2.orig/Modules/getpath.c 2011-09-03 19:16:46.000000000 +0300
+++ Python-3.2.2/Modules/getpath.c 2011-09-05 23:16:30.995060994 +0300
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
@ -120,7 +120,7 @@ diff -uar Python-3.2.2.orig/Modules/getpath.c Python-3.2.2/Modules/getpath.c
static void
reduce(wchar_t *dir)
@@ -583,7 +583,7 @@
@@ -685,7 +685,7 @@
}
else
wcsncpy(zip_path, _prefix, MAXPATHLEN);
@ -129,7 +129,7 @@ diff -uar Python-3.2.2.orig/Modules/getpath.c Python-3.2.2/Modules/getpath.c
bufsz = wcslen(zip_path); /* Replace "00" with version */
zip_path[bufsz - 6] = VERSION[0];
zip_path[bufsz - 5] = VERSION[2];
@@ -593,7 +593,7 @@
@@ -695,7 +695,7 @@
fprintf(stderr,
"Could not find platform dependent libraries <exec_prefix>\n");
wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
@ -138,19 +138,19 @@ diff -uar Python-3.2.2.orig/Modules/getpath.c Python-3.2.2/Modules/getpath.c
}
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
diff -uar Python-3.2.2.orig/setup.py Python-3.2.2/setup.py
--- Python-3.2.2.orig/setup.py 2011-09-03 19:16:50.000000000 +0300
+++ Python-3.2.2/setup.py 2011-09-05 23:16:30.995060994 +0300
@@ -396,7 +396,7 @@
# Ensure that /usr/local is always used, but the local build
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 @@
# directories (i.e. '.' and 'Include') must be first. See issue
# 10520.
- 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')
self.add_multiarch_paths()
@@ -643,11 +643,11 @@
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')
# only change this for cross builds for 3.3, issues on Mageia
if cross_compiling:
@@ -712,11 +712,11 @@
elif curses_library:
readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
@ -164,7 +164,7 @@ diff -uar Python-3.2.2.orig/setup.py Python-3.2.2/setup.py
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
@@ -684,8 +684,8 @@
@@ -753,8 +753,8 @@
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,

Loading…
Cancel
Save