mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-14 15:50:07 +02:00
python3: bump version for 3.5.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 9cc9c2f44cb3826ae0249420aafcb8caf7370211 Mon Sep 17 00:00:00 2001
|
||||
From ac95fb3752253b437b5bf7a2ca20e6e2527a73b6 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 10 Apr 2014 16:03:33 +0000
|
||||
Subject: initial Haiku patch
|
||||
@@ -156,7 +156,7 @@ index 3f78ef5..e2616e8 100644
|
||||
"python" + sys.version[:3],
|
||||
"site-packages"))
|
||||
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
|
||||
index 59cc38f..4a6d0ca 100644
|
||||
index 12f2f11..097ec1b 100644
|
||||
--- a/Lib/test/test_fileio.py
|
||||
+++ b/Lib/test/test_fileio.py
|
||||
@@ -377,6 +377,7 @@ class OtherFileTests:
|
||||
@@ -164,14 +164,14 @@ index 59cc38f..4a6d0ca 100644
|
||||
if sys.platform != "darwin" and \
|
||||
'bsd' not in sys.platform and \
|
||||
+ 'haiku' not in sys.platform and \
|
||||
not sys.platform.startswith('sunos'):
|
||||
not sys.platform.startswith(('sunos', 'aix')):
|
||||
# Somehow /dev/tty appears seekable on some BSDs
|
||||
self.assertEqual(f.seekable(), False)
|
||||
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index 87528a0..4fa024e 100644
|
||||
index a88b7d5..c305955 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -124,7 +124,7 @@ BINDIR= @bindir@
|
||||
@@ -125,7 +125,7 @@ BINDIR= @bindir@
|
||||
LIBDIR= @libdir@
|
||||
MANDIR= @mandir@
|
||||
INCLUDEDIR= @includedir@
|
||||
@@ -181,12 +181,12 @@ index 87528a0..4fa024e 100644
|
||||
ABIFLAGS= @ABIFLAGS@
|
||||
|
||||
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
|
||||
index e5f58ab..9dc5675 100644
|
||||
index 3e446a5..fd24794 100644
|
||||
--- a/Modules/posixmodule.c
|
||||
+++ b/Modules/posixmodule.c
|
||||
@@ -12756,7 +12756,7 @@ all_ins(PyObject *m)
|
||||
if (PyModule_AddIntMacro(m, SCHED_FIFO)) return -1;
|
||||
@@ -12788,7 +12788,7 @@ all_ins(PyObject *m)
|
||||
if (PyModule_AddIntMacro(m, SCHED_RR)) return -1;
|
||||
#endif
|
||||
#ifdef SCHED_SPORADIC
|
||||
- if (PyModule_AddIntMacro(m, SCHED_SPORADIC) return -1;
|
||||
+ if (PyModule_AddIntMacro(m, SCHED_SPORADIC)) return -1;
|
||||
@@ -194,7 +194,7 @@ index e5f58ab..9dc5675 100644
|
||||
#ifdef SCHED_BATCH
|
||||
if (PyModule_AddIntMacro(m, SCHED_BATCH)) return -1;
|
||||
diff --git a/Modules/resource.c b/Modules/resource.c
|
||||
index 3a1cf09..bb56e30 100644
|
||||
index 970ee84..c38c716 100644
|
||||
--- a/Modules/resource.c
|
||||
+++ b/Modules/resource.c
|
||||
@@ -83,6 +83,7 @@ resource_getrusage(PyObject *self, PyObject *args)
|
||||
@@ -229,7 +229,7 @@ index 3a1cf09..bb56e30 100644
|
||||
if (PyErr_Occurred()) {
|
||||
Py_DECREF(result);
|
||||
return NULL;
|
||||
@@ -334,19 +350,19 @@ PyInit_resource(void)
|
||||
@@ -332,19 +348,19 @@ PyInit_resource(void)
|
||||
(PyObject*) &StructRUsageType);
|
||||
|
||||
/* insert constants */
|
||||
@@ -253,7 +253,7 @@ index 3a1cf09..bb56e30 100644
|
||||
PyModule_AddIntMacro(m, RLIMIT_STACK);
|
||||
#endif
|
||||
|
||||
@@ -358,31 +374,31 @@ PyInit_resource(void)
|
||||
@@ -356,31 +372,31 @@ PyInit_resource(void)
|
||||
PyModule_AddIntMacro(m, RLIMIT_NOFILE);
|
||||
#endif
|
||||
|
||||
@@ -293,10 +293,10 @@ index 3a1cf09..bb56e30 100644
|
||||
#endif
|
||||
|
||||
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
|
||||
index 8f571a2..8f565bc 100644
|
||||
index af6cc94..8631fca 100644
|
||||
--- a/Modules/socketmodule.c
|
||||
+++ b/Modules/socketmodule.c
|
||||
@@ -6439,7 +6439,9 @@ PyInit__socket(void)
|
||||
@@ -6443,7 +6443,9 @@ PyInit__socket(void)
|
||||
PyModule_AddIntMacro(m, SOCK_DGRAM);
|
||||
/* We have incomplete socket support. */
|
||||
PyModule_AddIntMacro(m, SOCK_RAW);
|
||||
@@ -322,7 +322,7 @@ index 3cce927..6241a7d 100644
|
||||
#include <bluetooth/bluetooth.h>
|
||||
#include <bluetooth/rfcomm.h>
|
||||
diff --git a/Modules/spwdmodule.c b/Modules/spwdmodule.c
|
||||
index 49324d5..5fb3741 100644
|
||||
index 4b9f3cd..76e7d46 100644
|
||||
--- a/Modules/spwdmodule.c
|
||||
+++ b/Modules/spwdmodule.c
|
||||
@@ -87,7 +87,9 @@ static PyObject *mkspent(struct spwd *p)
|
||||
@@ -336,7 +336,7 @@ index 49324d5..5fb3741 100644
|
||||
SETI(setIndex++, p->sp_max);
|
||||
SETI(setIndex++, p->sp_warn);
|
||||
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
|
||||
index f3d0c9a..d1162bf 100644
|
||||
index 9f5db2a..0091e48 100644
|
||||
--- a/Python/bltinmodule.c
|
||||
+++ b/Python/bltinmodule.c
|
||||
@@ -24,7 +24,7 @@
|
||||
@@ -374,10 +374,10 @@ index 0967fc2..e30a59a 100755
|
||||
def main():
|
||||
global filedict
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1c07c05..44b3a67 100644
|
||||
index 49d1a37..34a810e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1118,6 +1118,16 @@ if test $enable_shared = "yes"; then
|
||||
@@ -1129,6 +1129,16 @@ if test $enable_shared = "yes"; then
|
||||
PY3LIBRARY=libpython3.so
|
||||
fi
|
||||
;;
|
||||
@@ -394,7 +394,7 @@ index 1c07c05..44b3a67 100644
|
||||
hp*|HP*)
|
||||
case `uname -m` in
|
||||
ia64)
|
||||
@@ -1211,6 +1221,7 @@ AC_PROG_MKDIR_P
|
||||
@@ -1205,6 +1215,7 @@ AC_PROG_MKDIR_P
|
||||
AC_SUBST(LN)
|
||||
if test -z "$LN" ; then
|
||||
case $ac_sys_system in
|
||||
@@ -402,7 +402,7 @@ index 1c07c05..44b3a67 100644
|
||||
CYGWIN*) LN="ln -s";;
|
||||
*) LN=ln;;
|
||||
esac
|
||||
@@ -2368,7 +2379,7 @@ then
|
||||
@@ -2437,7 +2448,7 @@ then
|
||||
BLDSHARED="$LDSHARED"
|
||||
fi
|
||||
;;
|
||||
@@ -411,7 +411,7 @@ index 1c07c05..44b3a67 100644
|
||||
LDSHARED='$(CC) -shared'
|
||||
LDCXXSHARED='$(CXX) -shared';;
|
||||
BSD/OS*/4*)
|
||||
@@ -2437,7 +2448,7 @@ then
|
||||
@@ -2506,7 +2517,7 @@ then
|
||||
then CCSHARED="-fPIC";
|
||||
else CCSHARED="+z";
|
||||
fi;;
|
||||
@@ -420,7 +420,7 @@ index 1c07c05..44b3a67 100644
|
||||
BSD/OS*/4*) CCSHARED="-fpic";;
|
||||
FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
|
||||
OpenUNIX*|UnixWare*)
|
||||
@@ -2468,7 +2479,7 @@ then
|
||||
@@ -2537,7 +2548,7 @@ then
|
||||
LINKFORSHARED="-Wl,-E -Wl,+s";;
|
||||
# LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
|
||||
BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
|
||||
@@ -429,7 +429,7 @@ index 1c07c05..44b3a67 100644
|
||||
# -u libsys_s pulls in all symbols in libsys
|
||||
Darwin/*)
|
||||
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
|
||||
@@ -2653,6 +2664,12 @@ LDFLAGS="-fsanitize=address $LDFLAGS"
|
||||
@@ -2719,6 +2730,12 @@ LDFLAGS="-fsanitize=address $LDFLAGS"
|
||||
AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4
|
||||
AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets
|
||||
|
||||
@@ -442,7 +442,7 @@ index 1c07c05..44b3a67 100644
|
||||
AC_MSG_CHECKING(for --with-libs)
|
||||
AC_ARG_WITH(libs,
|
||||
AS_HELP_STRING([--with-libs='lib1 ...'], [link against additional libs]),
|
||||
@@ -3998,6 +4015,7 @@ fi],
|
||||
@@ -4066,6 +4083,7 @@ fi],
|
||||
AC_SUBST(LIBM)
|
||||
case $ac_sys_system in
|
||||
Darwin) ;;
|
||||
@@ -451,10 +451,10 @@ index 1c07c05..44b3a67 100644
|
||||
esac
|
||||
AC_MSG_CHECKING(for --with-libm=STRING)
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 174ce72..d83a809 100644
|
||||
index 40f8bf2..be498e3 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -481,8 +481,8 @@ class PyBuildExt(build_ext):
|
||||
@@ -480,8 +480,8 @@ class PyBuildExt(build_ext):
|
||||
os.unlink(tmpfile)
|
||||
|
||||
def detect_math_libs(self):
|
||||
@@ -465,7 +465,7 @@ index 174ce72..d83a809 100644
|
||||
return []
|
||||
else:
|
||||
return ['m']
|
||||
@@ -564,6 +564,12 @@ class PyBuildExt(build_ext):
|
||||
@@ -563,6 +563,12 @@ class PyBuildExt(build_ext):
|
||||
config_h_vars = sysconfig.parse_config_h(file)
|
||||
|
||||
srcdir = sysconfig.get_config_var('srcdir')
|
||||
@@ -478,7 +478,7 @@ index 174ce72..d83a809 100644
|
||||
|
||||
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
|
||||
if host_platform in ['osf1', 'unixware7', 'openunix8']:
|
||||
@@ -812,15 +818,22 @@ class PyBuildExt(build_ext):
|
||||
@@ -811,15 +817,22 @@ class PyBuildExt(build_ext):
|
||||
'/usr/local/ssl/include',
|
||||
'/usr/contrib/ssl/include/'
|
||||
]
|
||||
@@ -504,7 +504,7 @@ index 174ce72..d83a809 100644
|
||||
['/usr/local/ssl/lib',
|
||||
'/usr/contrib/ssl/lib/'
|
||||
] )
|
||||
@@ -828,8 +841,8 @@ class PyBuildExt(build_ext):
|
||||
@@ -827,8 +840,8 @@ class PyBuildExt(build_ext):
|
||||
if (ssl_incs is not None and
|
||||
ssl_libs is not None):
|
||||
exts.append( Extension('_ssl', ['_ssl.c'],
|
||||
@@ -515,7 +515,7 @@ index 174ce72..d83a809 100644
|
||||
libraries = ['ssl', 'crypto'],
|
||||
depends = ['socketmodule.h']), )
|
||||
else:
|
||||
@@ -869,8 +882,8 @@ class PyBuildExt(build_ext):
|
||||
@@ -868,8 +881,8 @@ class PyBuildExt(build_ext):
|
||||
# of hash functions from the OpenSSL library.
|
||||
exts.append( Extension('_hashlib', ['_hashopenssl.c'],
|
||||
depends = ['hashlib.h'],
|
||||
@@ -526,7 +526,7 @@ index 174ce72..d83a809 100644
|
||||
libraries = ['ssl', 'crypto']) )
|
||||
else:
|
||||
print("warning: openssl 0x%08x is too old for _hashlib" %
|
||||
@@ -1304,7 +1317,7 @@ class PyBuildExt(build_ext):
|
||||
@@ -1303,7 +1316,7 @@ class PyBuildExt(build_ext):
|
||||
exts.append( Extension('resource', ['resource.c']) )
|
||||
|
||||
# Sun yellow pages. Some systems have the functions in libc.
|
||||
@@ -536,5 +536,5 @@ index 174ce72..d83a809 100644
|
||||
if (self.compiler.find_library_file(lib_dirs, 'nsl')):
|
||||
libs = ['nsl']
|
||||
--
|
||||
2.2.2
|
||||
2.10.2
|
||||
|
||||
@@ -10,9 +10,9 @@ OSI-approved open source license.
|
||||
"
|
||||
HOMEPAGE="http://www.python.org"
|
||||
LICENSE="Python"
|
||||
COPYRIGHT="1990-2015, Python Software Foundation"
|
||||
COPYRIGHT="1990-2017, Python Software Foundation"
|
||||
SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="0010f56100b9b74259ebcd5d4b295a32324b58b517403a10d1a2aa7cb22bca40"
|
||||
CHECKSUM_SHA256="eefe2ad6575855423ab630f5b51a8ef6e5556f774584c06beab4926f930ddbb0"
|
||||
REVISION="1"
|
||||
ARCHITECTURES="x86 x86_64 !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="!x86"
|
||||
Reference in New Issue
Block a user