python3: bump version.

This commit is contained in:
Jerome Duval
2018-12-18 19:28:22 +01:00
parent 20348c5639
commit 7976876e3a
3 changed files with 37 additions and 37 deletions

View File

@@ -1,4 +1,4 @@
From df1c3f43f961a7085dd4e27162bb911120bb2585 Mon Sep 17 00:00:00 2001
From 86342bd79fd31f85bfb8df30d0b8bf1cc66cbd75 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
@@ -136,7 +136,7 @@ index 0000000..4372ee2
+set -v
+eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" $HEADERS/posix/netinet/in.h
diff --git a/Lib/site.py b/Lib/site.py
index 0fc9200..17596a1 100644
index 86ca2db..368d90e 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -303,7 +303,14 @@ def getsitepackages(prefixes=None):
@@ -168,7 +168,7 @@ index 57a0265..ea316a7 100644
# Somehow /dev/tty appears seekable on some BSDs
self.assertEqual(f.seekable(), False)
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 6cb0c63..a41df16 100644
index d912a19..4829a67 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -132,7 +132,7 @@ BINDIR= @bindir@
@@ -280,10 +280,10 @@ index 113ad5c..b9de0ab 100644
#endif
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index a351faa..4d5a936 100644
index ed31667..e1c163e 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -6852,7 +6852,9 @@ PyInit__socket(void)
@@ -6903,7 +6903,9 @@ PyInit__socket(void)
/* SOCK_RAW is marked as optional in the POSIX specification */
PyModule_AddIntMacro(m, SOCK_RAW);
#endif
@@ -294,7 +294,7 @@ index a351faa..4d5a936 100644
PyModule_AddIntMacro(m, SOCK_RDM);
#endif
diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index 03f982b..623b98a 100644
index af7c36a..ca5a873 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -54,6 +54,10 @@ typedef int socklen_t;
@@ -323,7 +323,7 @@ index 1601ec0..a4211be 100644
SETI(setIndex++, p->sp_max);
SETI(setIndex++, p->sp_warn);
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 911e2ba..994397e 100644
index d7b0bbd..ee9bebc 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -21,7 +21,7 @@
@@ -361,7 +361,7 @@ index 4363c0c..40994b0 100755
def main():
global filedict
diff --git a/configure.ac b/configure.ac
index e400fa1..2b316b4 100644
index 3f2459a..62bc0c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1157,6 +1157,16 @@ if test $enable_shared = "yes"; then
@@ -389,7 +389,7 @@ index e400fa1..2b316b4 100644
CYGWIN*) LN="ln -s";;
*) LN=ln;;
esac
@@ -2510,7 +2521,7 @@ then
@@ -2560,7 +2571,7 @@ then
BLDSHARED="$LDSHARED"
fi
;;
@@ -398,7 +398,7 @@ index e400fa1..2b316b4 100644
LDSHARED='$(CC) -shared'
LDCXXSHARED='$(CXX) -shared';;
BSD/OS*/4*)
@@ -2580,7 +2591,7 @@ then
@@ -2630,7 +2641,7 @@ then
else CCSHARED="+z";
fi;;
Linux-android*) ;;
@@ -407,7 +407,7 @@ index e400fa1..2b316b4 100644
BSD/OS*/4*) CCSHARED="-fpic";;
FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
OpenUNIX*|UnixWare*)
@@ -2612,7 +2623,7 @@ then
@@ -2662,7 +2673,7 @@ then
# LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
@@ -416,7 +416,7 @@ index e400fa1..2b316b4 100644
# -u libsys_s pulls in all symbols in libsys
Darwin/*)
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
@@ -2793,6 +2804,12 @@ LDFLAGS="-fsanitize=address $LDFLAGS"
@@ -2843,6 +2854,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
@@ -429,7 +429,7 @@ index e400fa1..2b316b4 100644
AC_MSG_CHECKING(for --with-libs)
AC_ARG_WITH(libs,
AS_HELP_STRING([--with-libs='lib1 ...'], [link against additional libs]),
@@ -4196,6 +4213,7 @@ fi],
@@ -4253,6 +4270,7 @@ fi],
AC_SUBST(LIBM)
case $ac_sys_system in
Darwin) ;;
@@ -438,10 +438,10 @@ index e400fa1..2b316b4 100644
esac
AC_MSG_CHECKING(for --with-libm=STRING)
diff --git a/setup.py b/setup.py
index 1cd1503..21b0de2 100644
index 49193f6..6aca04b 100644
--- a/setup.py
+++ b/setup.py
@@ -480,8 +480,8 @@ class PyBuildExt(build_ext):
@@ -505,8 +505,8 @@ class PyBuildExt(build_ext):
os.unlink(tmpfile)
def detect_math_libs(self):
@@ -452,7 +452,7 @@ index 1cd1503..21b0de2 100644
return []
else:
return ['m']
@@ -564,6 +564,12 @@ class PyBuildExt(build_ext):
@@ -594,6 +594,12 @@ class PyBuildExt(build_ext):
config_h_vars = sysconfig.parse_config_h(file)
srcdir = sysconfig.get_config_var('srcdir')
@@ -465,7 +465,7 @@ index 1cd1503..21b0de2 100644
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
if host_platform in ['osf1', 'unixware7', 'openunix8']:
@@ -815,15 +821,22 @@ class PyBuildExt(build_ext):
@@ -845,15 +851,22 @@ class PyBuildExt(build_ext):
'/usr/local/ssl/include',
'/usr/contrib/ssl/include/'
]
@@ -491,7 +491,7 @@ index 1cd1503..21b0de2 100644
['/usr/local/ssl/lib',
'/usr/contrib/ssl/lib/'
] )
@@ -831,8 +844,8 @@ class PyBuildExt(build_ext):
@@ -861,8 +874,8 @@ class PyBuildExt(build_ext):
if (ssl_incs is not None and
ssl_libs is not None):
exts.append( Extension('_ssl', ['_ssl.c'],
@@ -502,7 +502,7 @@ index 1cd1503..21b0de2 100644
libraries = ['ssl', 'crypto'],
depends = ['socketmodule.h']), )
else:
@@ -872,8 +885,8 @@ class PyBuildExt(build_ext):
@@ -902,8 +915,8 @@ class PyBuildExt(build_ext):
# of hash functions from the OpenSSL library.
exts.append( Extension('_hashlib', ['_hashopenssl.c'],
depends = ['hashlib.h'],
@@ -513,20 +513,20 @@ index 1cd1503..21b0de2 100644
libraries = ['ssl', 'crypto']) )
else:
print("warning: openssl 0x%08x is too old for _hashlib" %
@@ -1333,7 +1346,7 @@ class PyBuildExt(build_ext):
exts.append( Extension('resource', ['resource.c']) )
@@ -2217,7 +2230,7 @@ class PyBuildExt(build_ext):
return ext
# Sun yellow pages. Some systems have the functions in libc.
- if (host_platform not in ['cygwin', 'qnx6'] and
+ if (host_platform not in ['cygwin', 'qnx6', 'haiku1'] and
find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
if (self.compiler.find_library_file(lib_dirs, 'nsl')):
libs = ['nsl']
def _detect_nis(self, inc_dirs, lib_dirs):
- if host_platform in {'win32', 'cygwin', 'qnx6'}:
+ if host_platform in {'win32', 'cygwin', 'qnx6', 'haiku1'}:
return None
libs = []
--
2.14.2
2.19.1
From 911f42e9ea41c63fa2cbe8fa5f0f0ec3e0c02d8d Mon Sep 17 00:00:00 2001
From d9e7a5386b6668d9bf46b1ade6356322ea11fa41 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 16 Apr 2017 10:05:42 +0200
Subject: fix for negative errnos
@@ -546,10 +546,10 @@ index 290ae44..95ec9d3 100644
if child_exec_never_called:
err_msg = ""
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
index d1434d5..658cda9 100644
index fe0e554..d2a0d52 100644
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -523,6 +523,10 @@ error:
@@ -527,6 +527,10 @@ error:
char *cur;
_Py_write_noraise(errpipe_write, "OSError:", 8);
cur = hex_errno + sizeof(hex_errno);
@@ -561,10 +561,10 @@ index d1434d5..658cda9 100644
*--cur = Py_hexdigits[saved_errno % 16];
saved_errno /= 16;
--
2.14.2
2.19.1
From 1b7947af27024d62d80b5d795678b448144d0372 Mon Sep 17 00:00:00 2001
From f9408c3d0f3242fa21cb06278ded8b684eafd805 Mon Sep 17 00:00:00 2001
From: Philippe Houdoin <philippe.houdoin@gmail.com>
Date: Wed, 24 May 2017 11:09:43 +0000
Subject: Implement CTypes's find_library for Haiku
@@ -645,5 +645,5 @@ index 339ae8a..d537963 100644
print(cdll.LoadLibrary("libm.so"))
print(cdll.LoadLibrary("libcrypt.so"))
--
2.14.2
2.19.1

View File

@@ -10,10 +10,10 @@ OSI-approved open source license.
"
HOMEPAGE="https://www.python.org"
LICENSE="Python"
COPYRIGHT="1990-2017, Python Software Foundation"
REVISION="6"
COPYRIGHT="1990-2018 Python Software Foundation"
REVISION="1"
SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz"
CHECKSUM_SHA256="cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da"
CHECKSUM_SHA256="81fd1401a9d66533b0a3e9e3f4ea1c7c6702d57d5b90d659f971e6f1b745f77d"
SOURCE_DIR="Python-$portVersion"
PATCHES="python3-$portVersion.patchset"
if [ "$secondaryArchSuffix" = _x86 ] ; then