commit: d91ba51ce99e7d8f202f234cf23782eae6fdc0ad
parent 30374560967b8f757ec0d714ccf8d8e3bdaa7b3b
Author: Michael Forney <mforney@mforney.org>
Date: Thu, 23 Aug 2018 13:46:27 -0700
python: Update to 3.7.0
Diffstat:
12 files changed, 210 insertions(+), 174 deletions(-)
diff --git a/pkg/python/.gitignore b/pkg/python/.gitignore
@@ -1,2 +1,3 @@
-/Python-3.6.5.tar.xz
+/Python-3.7.0.tar.xz
+/modules.ninja
/src
diff --git a/pkg/python/Setup b/pkg/python/Setup
@@ -1,99 +0,0 @@
-*static*
-# from Setup.local
-_thread _threadmodule.c
-
-# from Setup.dist
-posix posixmodule.c
-errno errnomodule.c
-pwd pwdmodule.c
-_sre _sre.c
-_codecs _codecsmodule.c
-_weakref _weakref.c
-_functools _functoolsmodule.c
-_operator _operator.c
-_collections _collectionsmodule.c
-itertools itertoolsmodule.c
-atexit atexitmodule.c
-_signal signalmodule.c
-_stat _stat.c
-time timemodule.c
-_locale _localemodule.c
-_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
-zipimport zipimport.c
-faulthandler faulthandler.c
-_tracemalloc _tracemalloc.c hashtable.c
-#_symtable symtablemodule.c
-#xxsubtype xxsubtype.c
-
-# setup.py:/Extension
-array arraymodule.c
-cmath cmathmodule.c _math.c
-math mathmodule.c _math.c
-# time defined above
-_datetime _datetimemodule.c
-_random _randommodule.c
-_bisect _bisectmodule.c
-_heapq _heapqmodule.c
-_pickle _pickle.c
-# atexit defined above
-_json _json.c
-#_testcapi _testcapimodule.c
-#_testbuffer _testbuffer.c
-#_testimportmultiple _testimportmultiple.c
-#_testmultiphase _testmultiphase.c
-#_lsprof _lsprof.c rotatingtree.c
-unicodedata unicodedata.c
-_opcode _opcode.c
-_asyncio _asynciomodule.c
-fcntl fcntlmodule.c
-# pwd defined above
-grp grpmodule.c
-spwd spwdmodule.c
-select selectmodule.c
-parser parsermodule.c
-mmap mmapmodule.c
-#syslog syslogmodule.c
-#audioop audioop.c
-#readline readline.c
-_crypt _cryptmodule.c
-_csv _csv.c
-_posixsubprocess _posixsubprocess.c
-_socket socketmodule.c
-_ssl _ssl.c
-_hashlib _hashopenssl.c
-#_sha256 sha256module.c
-#_sha512 sha512module.c
-#_md5 md5module.c
-#_sha1 sha1module.c
-_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
-_sha3 _sha3/sha3module.c
-#_sqlite3 _sqlite/cache.c _sqlite/connection.c _sqlite/cursor.c _sqlite/microprotocols.c _sqlite/module.c _sqlite/prepare_protocol.c _sqlite/row.c _sqlite/statement.c _sqlite/util.c
-#_dbm _dbmmodule.c
-#_gdbm _gdbmmodule.c
-termios termios.c
-resource resource.c
-#nis nismodule.c
-#_curses _cursesmodule.c
-#_curses_panel _curses_panel.c
-zlib zlibmodule.c
-binascii binascii.c
-#_bz2 _bz2module.c
-#_lzma _lzmamodule.c
-pyexpat pyexpat.c
-#_elementtree _elementtree.c
-#_multibytecodec cjkcodecs/multibytecodec.c
-#_codecs_kr cjkcodecs/_codecs_kr.c
-#_codecs_jp cjkcodecs/_codecs_jp.c
-#_codecs_cn cjkcodecs/_codecs_cn.c
-#_codecs_tw cjkcodecs/_codecs_tw.c
-#_codecs_hk cjkcodecs/_codecs_hk.c
-#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
-_multiprocessing _multiprocessing/multiprocessing.c _multiprocessing/semaphore.c
-#ossaudiodev ossaudiodev.c
-#_scproxy _scproxy.c
-#xxlimited xxlimited.c
-#_tkinter _tkinter.c tkappinit.c
-#_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c
-#_ctypes_test _ctypes/_ctypes_test.c
-#_decimal
-_struct _struct.c
diff --git a/pkg/python/gen.lua b/pkg/python/gen.lua
@@ -1,28 +1,13 @@
cflags{
'-fwrapv',
'-D NDEBUG',
- '-D Py_BUILD_CORE',
'-I $dir',
'-I $srcdir/Include',
}
-local sources = {}
-local modules = {}
-for line in iterlines('Setup') do
- if not line:hasprefix('*') then
- local i = line:find(' ', 1, true)
- modules[line:sub(1, i and i - 1)] = true
- while i do
- local j = line:find(' ', i + 1, true)
- sources[line:sub(i + 1, j and j - 1)] = true
- i = j
- end
- end
-end
-sources = table.keys(sources)
-
pkg.deps = {}
local libs = {}
+local modules = load 'modules.lua'
if modules['_ctypes'] then
cflags{'-I $builddir/pkg/libffi/include'}
@@ -43,15 +28,38 @@ if modules['pyexpat'] then
table.insert(libs, 'expat/libexpat.a.d')
end
if modules['zlib'] then
- cflags{' -I $builddir/pkg/zlib/include'}
+ cflags{'-I $builddir/pkg/zlib/include'}
table.insert(pkg.deps, 'pkg/zlib/headers')
table.insert(libs, 'zlib/libz.a')
end
-rule('makesetup', 'cd $outdir && $$OLDPWD/$srcdir/Modules/makesetup -s $$OLDPWD/$srcdir -m - $$OLDPWD/$in')
-build('makesetup', '$outdir/config.c', {
- '$dir/Setup', '|', '$srcdir/Modules/makesetup', '$srcdir/Modules/config.c.in'
-})
+local sources = {}
+sub('modules.ninja', function()
+ -- snapshot $cflags in the subninja environment
+ cflags{}
+
+ for _, mod in pairs(modules) do
+ if mod.core then
+ for _, src in ipairs(mod) do
+ sources[src] = true
+ end
+ else
+ for _, src in ipairs(mod) do
+ local obj = src..'.o'
+ if not sources[obj] then
+ cc('Modules/'..src)
+ sources[obj] = true
+ end
+ end
+ end
+ end
+end)
+sources = table.keys(sources)
+
+cflags{'-D Py_BUILD_CORE'}
+
+rule('makesetup', 'lua $dir/makesetup.lua $dir/modules.lua <$in >$out.tmp && mv $out.tmp $out')
+build('makesetup', '$outdir/config.c', {'$srcdir/Modules/config.c.in', '|', '$dir/makesetup.lua', '$dir/modules.lua'})
cc('Modules/getbuildinfo.c', nil, {
cflags=[[$cflags -D 'DATE="Mar 28 2018"' -D 'TIME="05:19:59"']]
@@ -62,7 +70,7 @@ cc('Modules/getpath.c', nil, {
[[-D 'PYTHONPATH=":plat-linux"']],
[[-D 'PREFIX="/"']],
[[-D 'EXEC_PREFIX="/"']],
- [[-D 'VERSION="3.6"']],
+ [[-D 'VERSION="3.7"']],
[[-D 'VPATH=""']],
},
})
@@ -98,6 +106,7 @@ lib('libpython.a', {expand{'Modules/', sources}, paths[[
bytes_methods.c
bytearrayobject.c
bytesobject.c
+ call.c
cellobject.c
classobject.c
codeobject.c
@@ -150,6 +159,8 @@ lib('libpython.a', {expand{'Modules/', sources}, paths[[
Python-ast.c
asdl.c
ast.c
+ ast_opt.c
+ ast_unparse.c
bltinmodule.c
ceval.c
compile.c
@@ -168,8 +179,9 @@ lib('libpython.a', {expand{'Modules/', sources}, paths[[
importdl.c
marshal.c
modsupport.c
- mystrtoul.c
mysnprintf.c
+ mystrtoul.c
+ pathconfig.c
peephole.c
pyarena.c
pyctype.c
@@ -178,12 +190,15 @@ lib('libpython.a', {expand{'Modules/', sources}, paths[[
pylifecycle.c
pymath.c
pystate.c
+ context.c
+ hamt.c
pythonrun.c
pytime.c
- random.c
+ bootstrap_hash.c
structmember.c
symtable.c
sysmodule.c.o
+ thread.c
traceback.c
getopt.c
pystrcmp.c
@@ -193,7 +208,6 @@ lib('libpython.a', {expand{'Modules/', sources}, paths[[
formatter_unicode.c
fileutils.c
dynload_stub.c
- thread.c
frozen.c
)
$outdir/config.c
@@ -204,10 +218,10 @@ file('bin/python3', '755', '$outdir/python')
sym('bin/python', 'python3')
for f in iterlines('pylibs.txt') do
- file('lib/python3.6/'..f, '644', '$srcdir/Lib/'..f)
+ file('lib/python3.7/'..f, '644', '$srcdir/Lib/'..f)
end
-file('lib/python3.6/_sysconfigdata_'..abiflags..'_'..platform..'_.py', '644', '$dir/lib/_sysconfigdata.py')
-file('lib/python3.6/Makefile', '644', '$dir/lib/Makefile')
-dir('lib/python3.6/lib-dynload', '755')
+file('lib/python3.7/_sysconfigdata_'..abiflags..'_'..platform..'_.py', '644', '$dir/lib/_sysconfigdata.py')
+file('lib/python3.7/Makefile', '644', '$dir/lib/Makefile')
+dir('lib/python3.7/lib-dynload', '755')
fetch 'curl'
diff --git a/pkg/python/makesetup.lua b/pkg/python/makesetup.lua
@@ -0,0 +1,19 @@
+local modules = {}
+for m in pairs(dofile(arg[1])) do
+ table.insert(modules, m)
+end
+table.sort(modules)
+
+for line in io.lines() do
+ if line == '/* -- ADDMODULE MARKER 1 -- */' then
+ for _, m in ipairs(modules) do
+ print('extern PyObject *PyInit_'..m..'(void);')
+ end
+ elseif line == '/* -- ADDMODULE MARKER 2 -- */' then
+ for _, m in ipairs(modules) do
+ print(' {"'..m..'", PyInit_'..m..'},')
+ end
+ else
+ print(line)
+ end
+end
diff --git a/pkg/python/modules.lua b/pkg/python/modules.lua
@@ -0,0 +1,113 @@
+return {
+ -- Setup.dist
+ posix={'posixmodule.c', core=true},
+ errno={'errnomodule.c'},
+ pwd={'pwdmodule.c'},
+ _sre={'_sre.c'},
+ _codecs={'_codecsmodule.c'},
+ _weakref={'_weakref.c'},
+ _functools={'_functoolsmodule.c', core=true},
+ _operator={'_operator.c'},
+ _collections={'_collectionsmodule.c'},
+ _abc={'_abc.c'},
+ itertools={'itertoolsmodule.c'},
+ atexit={'atexitmodule.c'},
+ _signal={'signalmodule.c', core=true},
+ _stat={'_stat.c'},
+ time={'timemodule.c', core=true},
+ _thread={'_threadmodule.c', core=true},
+ _locale={'_localemodule.c'},
+ _io={
+ '_io/_iomodule.c',
+ '_io/iobase.c',
+ '_io/fileio.c',
+ '_io/bytesio.c',
+ '_io/bufferedio.c',
+ '_io/textio.c',
+ '_io/stringio.c',
+ core=true,
+ },
+ zipimport={'zipimport.c', core=true},
+ faulthandler={'faulthandler.c'},
+ _tracemalloc={'_tracemalloc.c', 'hashtable.c'},
+ --_symtable={'symtablemodule.c'},
+ --xxsubtype={'xxsubtype.c'},
+
+ -- setup.py:/Extension
+ array={'arraymodule.c'},
+ _contextvars={'_contextvarsmodule.c'},
+ cmath={'cmathmodule.c', '_math.c'},
+ math={'mathmodule.c', '_math.c'},
+ -- time defined above
+ _datetime={'_datetimemodule.c'},
+ _random={'_randommodule.c'},
+ _bisect={'_bisectmodule.c'},
+ _heapq={'_heapqmodule.c'},
+ _pickle={'_pickle.c'},
+ -- atexit defined above
+ _json={'_json.c'},
+ --_testcapi={'_testcapimodule.c'},
+ --_testbuffer={'_testbuffer.c'},
+ --_testimportmultiple={'_testimportmultiple.c'},
+ --_testmultiphase={'_testmultiphase.c'},
+ --_lsprof={'_lsprof.c', 'rotatingtree.c'},
+ unicodedata={'unicodedata.c'},
+ _opcode={'_opcode.c'},
+ _asyncio={'_asynciomodule.c'},
+ _abc={'_abc.c'},
+ _queue={'_queuemodule.c'},
+ fcntl={'fcntlmodule.c'},
+ -- pwd defined above
+ grp={'grpmodule.c'},
+ spwd={'spwdmodule.c'},
+ select={'selectmodule.c'},
+ parser={'parsermodule.c'},
+ mmap={'mmapmodule.c'},
+ --syslog={'syslogmodule.c'},
+ --_xxtestfuzz={'_xxtestfuzz/_xxtestfuzz.c', '_xxtestfuzz/fuzzer.c'},
+ --audioop={'audioop.c'},
+ --readline={'readline.c'},
+ _crypt={'_cryptmodule.c'},
+ _csv={'_csv.c'},
+ _posixsubprocess={'_posixsubprocess.c'},
+ _socket={'socketmodule.c'},
+ _ssl={'_ssl.c'},
+ _hashlib={'_hashopenssl.c'},
+ --_sha256={'sha256module.c'},
+ --_sha512={'sha512module.c'},
+ --_md5={'md5module.c'},
+ --_sha1={'sha1module.c'},
+ _blake2={'_blake2/blake2module.c', '_blake2/blake2b_impl.c', '_blake2/blake2s_impl.c'},
+ _sha3={'_sha3/sha3module.c'},
+ --_sqlite3={'_sqlite/cache.c', '_sqlite/connection.c', '_sqlite/cursor.c', '_sqlite/microprotocols.c', '_sqlite/module.c', '_sqlite/prepare_protocol.c', '_sqlite/row.c', '_sqlite/statement.c', '_sqlite/util.c'},
+ --_dbm={'_dbmmodule.c'},
+ --_gdbm={'_gdbmmodule.c'},
+ termios={'termios.c'},
+ resource={'resource.c'},
+ --nis={'nismodule.c'},
+ --_curses={'_cursesmodule.c'},
+ --_curses_panel={'_curses_panel.c'},
+ zlib={'zlibmodule.c'},
+ binascii={'binascii.c'},
+ --_bz2={'_bz2module.c'},
+ --_lzma={'_lzmamodule.c'},
+ pyexpat={'pyexpat.c'},
+ --_elementtree={'_elementtree.c'},
+ --_multibytecodec={'cjkcodecs/multibytecodec.c'},
+ --_codecs_kr={'cjkcodecs/_codecs_kr.c'},
+ --_codecs_jp={'cjkcodecs/_codecs_jp.c'},
+ --_codecs_cn={'cjkcodecs/_codecs_cn.c'},
+ --_codecs_tw={'cjkcodecs/_codecs_tw.c'},
+ --_codecs_hk={'cjkcodecs/_codecs_hk.c'},
+ --_codecs_iso2022={'cjkcodecs/_codecs_iso2022.c'},
+ _multiprocessing={'_multiprocessing/multiprocessing.c', '_multiprocessing/semaphore.c'},
+ --ossaudiodev={'ossaudiodev.c'},
+ --_scproxy={'_scproxy.c'},
+ --xxlimited={'xxlimited.c'},
+ --_tkinter={'_tkinter.c', 'tkappinit.c'},
+ --_uuid={'_uuidmodule.c'},
+ --_ctypes={'_ctypes/_ctypes.c', '_ctypes/callbacks.c', '_ctypes/callproc.c', '_ctypes/stgdict.c', '_ctypes/cfield.c'},
+ --_ctypes_test={'_ctypes/_ctypes_test.c'},
+ --_decimal={'_decimal/_decimal.c'},
+ _struct={'_struct.c'},
+}
diff --git a/pkg/python/patch/0001-Fix-build-with-libressl-2.7.0.patch b/pkg/python/patch/0001-Fix-build-with-libressl-2.7.0.patch
@@ -1,25 +0,0 @@
-From b7f437785aa3616066e5c5845e466f49b50db263 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Thu, 22 Mar 2018 23:42:12 -0700
-Subject: [PATCH] Fix build with libressl-2.7.0
-
----
- Modules/_ssl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/_ssl.c b/Modules/_ssl.c
-index c54e43c2b4..93e15c91d0 100644
---- a/Modules/_ssl.c
-+++ b/Modules/_ssl.c
-@@ -104,7 +104,7 @@ struct py_ssl_library_code {
- /* Include generated data (error codes) */
- #include "_ssl_data.h"
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- # define OPENSSL_VERSION_1_1 1
- #endif
-
---
-2.17.0
-
diff --git a/pkg/python/pyconfig.h b/pkg/python/pyconfig.h
@@ -65,6 +65,7 @@
#define HAVE_DECL_RTLD_GLOBAL 1
#define HAVE_DECL_RTLD_LAZY 1
#define HAVE_DECL_RTLD_LOCAL 1
+#define HAVE_DECL_RTLD_MEMBER 0
#define HAVE_DECL_RTLD_NODELETE 1
#define HAVE_DECL_RTLD_NOLOAD 1
#define HAVE_DECL_RTLD_NOW 1
@@ -191,6 +192,7 @@
#define HAVE_LINUX_NETLINK_H 1
#define HAVE_LINUX_RANDOM_H 1
#define HAVE_LINUX_TIPC_H 1
+#define HAVE_LINUX_VM_SOCKETS_H 1
#define HAVE_LOCKF 1
#define HAVE_LOG1P 1
#define HAVE_LOG2 1
@@ -199,7 +201,6 @@
#define HAVE_LUTIMES 1
#define HAVE_MAKEDEV 1
#define HAVE_MBRTOWC 1
-#define HAVE_MEMMOVE 1
#define HAVE_MEMORY_H 1
#define HAVE_MEMRCHR 1
#define HAVE_MKDIRAT 1
@@ -225,12 +226,15 @@
#define HAVE_POLL_H 1
#define HAVE_POSIX_FADVISE 1
#define HAVE_POSIX_FALLOCATE 1
+#define HAVE_POSIX_SPAWN 1
#define HAVE_PREAD 1
+#define HAVE_PREADV 1
+/* #undef HAVE_PREADV2 */
#define HAVE_PRLIMIT 1
/* #undef HAVE_PROCESS_H */
#define HAVE_PROTOTYPES 1
-#define HAVE_PTHREAD_ATFORK 1
/* #undef HAVE_PTHREAD_DESTRUCTOR */
+#define HAVE_PTHREAD_GETCPUCLOCKID 1
#define HAVE_PTHREAD_H 1
/* #undef HAVE_PTHREAD_INIT */
#define HAVE_PTHREAD_KILL 1
@@ -238,13 +242,14 @@
#define HAVE_PTY_H 1
#define HAVE_PUTENV 1
#define HAVE_PWRITE 1
+#define HAVE_PWRITEV 1
+/* #undef HAVE_PWRITEV2 */
#define HAVE_READLINK 1
#define HAVE_READLINKAT 1
#define HAVE_READV 1
#define HAVE_REALPATH 1
#define HAVE_RENAMEAT 1
/* #undef HAVE_RL_APPEND_HISTORY */
-/* #undef HAVE_RL_CALLBACK */
/* #undef HAVE_RL_CATCH_SIGNAL */
/* #undef HAVE_RL_COMPLETION_APPEND_CHARACTER */
/* #undef HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK */
@@ -259,7 +264,6 @@
#define HAVE_SCHED_SETAFFINITY 1
#define HAVE_SCHED_SETPARAM 1
#define HAVE_SCHED_SETSCHEDULER 1
-#define HAVE_SELECT 1
#define HAVE_SEM_GETVALUE 1
#define HAVE_SEM_OPEN 1
#define HAVE_SEM_TIMEDWAIT 1
@@ -285,6 +289,7 @@
#define HAVE_SHADOW_H 1
#define HAVE_SIGACTION 1
#define HAVE_SIGALTSTACK 1
+#define HAVE_SIGINFO_T_SI_BAND 1
#define HAVE_SIGINTERRUPT 1
#define HAVE_SIGNAL_H 1
#define HAVE_SIGPENDING 1
@@ -386,6 +391,11 @@
#define HAVE_UTIMENSAT 1
#define HAVE_UTIMES 1
#define HAVE_UTIME_H 1
+/* #undef HAVE_UUID_CREATE */
+/* #undef HAVE_UUID_ENC_BE */
+/* #undef HAVE_UUID_GENERATE_TIME_SAFE */
+/* #undef HAVE_UUID_H */
+/* #undef HAVE_UUID_UUID_H */
#define HAVE_WAIT3 1
#define HAVE_WAIT4 1
#define HAVE_WAITID 1
@@ -397,6 +407,7 @@
#define HAVE_WMEMCMP 1
#define HAVE_WORKING_TZSET 1
#define HAVE_WRITEV 1
+#define HAVE_X509_VERIFY_PARAM_SET1_HOST 1
#define HAVE_ZLIB_COPY 1
/* #undef HAVE__GETPTY */
/* #undef LOG1P_DROPS_ZERO_SIGN */
@@ -410,9 +421,14 @@
/* #undef PACKAGE_URL */
/* #undef PACKAGE_VERSION */
/* #undef POSIX_SEMAPHORES_NOT_ENABLED */
+#define PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT 1
#define PTHREAD_SYSTEM_SCHED_SUPPORTED 1
/* #undef PYLONG_BITS_IN_DIGIT */
+#define PY_COERCE_C_LOCALE 1
#define PY_FORMAT_SIZE_T "z"
+#define PY_SSL_DEFAULT_CIPHERS 1
+/* #undef PY_SSL_DEFAULT_CIPHER_STRING */
+#define PY_WARN_ON_C_LOCALE 1
/* #undef Py_DEBUG */
/* #undef Py_ENABLE_SHARED */
/* #undef Py_HASH_ALGORITHM */
@@ -428,6 +444,7 @@
#define SIZEOF_LONG_LONG 8
#define SIZEOF_OFF_T 8
#define SIZEOF_PID_T 4
+#define SIZEOF_PTHREAD_KEY_T 4
#define SIZEOF_PTHREAD_T 8
#define SIZEOF_SHORT 2
#define SIZEOF_SIZE_T 8
@@ -443,7 +460,6 @@
#define TIME_WITH_SYS_TIME 1
/* #undef TM_IN_SYS_TIME */
/* #undef USE_COMPUTED_GOTOS */
-#define USE_INLINE 1
#ifndef _ALL_SOURCE
# define _ALL_SOURCE 1
#endif
@@ -459,7 +475,6 @@
#ifndef __EXTENSIONS__
# define __EXTENSIONS__ 1
#endif
-/* #undef WANT_SIGFPE_HANDLER */
/* #undef WINDOW_HAS_FLAGS */
#define WITH_DOC_STRINGS 1
/* #undef WITH_DTRACE */
@@ -467,7 +482,6 @@
/* #undef WITH_LIBINTL */
/* #undef WITH_NEXT_FRAMEWORK */
/* #undef WITH_PYMALLOC */
-#define WITH_THREAD 1
/* #undef WITH_VALGRIND */
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
@@ -480,7 +494,6 @@
#endif
/* #undef X87_DOUBLE_ROUNDING */
/* #undef _BSD_SOURCE */
-#define _BSD_TYPES 1
#define _DARWIN_C_SOURCE 1
#define _FILE_OFFSET_BITS 64
#define _GNU_SOURCE 1
@@ -493,6 +506,7 @@
#define _POSIX_C_SOURCE 200809L
/* #undef _POSIX_SOURCE */
/* #undef _POSIX_THREADS */
+#define _PYTHONFRAMEWORK ""
#define _REENTRANT 1
#define _XOPEN_SOURCE 700
#define _XOPEN_SOURCE_EXTENDED 1
@@ -503,9 +517,6 @@
/* #undef clock_t */
/* #undef const */
/* #undef gid_t */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
/* #undef mode_t */
/* #undef off_t */
/* #undef pid_t */
@@ -513,7 +524,6 @@
/* #undef size_t */
/* #undef socklen_t */
/* #undef uid_t */
-/* #undef volatile */
#if defined(__USLC__) && defined(__SCO_VERSION__)
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
#endif
diff --git a/pkg/python/pylibs.txt b/pkg/python/pylibs.txt
@@ -8,6 +8,7 @@ _compression.py
_dummy_thread.py
_markupbase.py
_osx_support.py
+_py_abc.py
_pydecimal.py
_pyio.py
_sitebuiltins.py
@@ -25,22 +26,22 @@ asyncio/base_events.py
asyncio/base_futures.py
asyncio/base_subprocess.py
asyncio/base_tasks.py
-asyncio/compat.py
asyncio/constants.py
asyncio/coroutines.py
asyncio/events.py
+asyncio/format_helpers.py
asyncio/futures.py
asyncio/locks.py
asyncio/log.py
asyncio/proactor_events.py
asyncio/protocols.py
asyncio/queues.py
+asyncio/runners.py
asyncio/selector_events.py
asyncio/sslproto.py
asyncio/streams.py
asyncio/subprocess.py
asyncio/tasks.py
-asyncio/test_utils.py
asyncio/transports.py
asyncio/unix_events.py
asyncio/windows_events.py
@@ -71,11 +72,13 @@ concurrent/futures/process.py
concurrent/futures/thread.py
configparser.py
contextlib.py
+contextvars.py
copy.py
copyreg.py
crypt.py
csv.py
ctypes/__init__.py
+ctypes/_aix.py
ctypes/_endian.py
ctypes/macholib/__init__.py
ctypes/macholib/dyld.py
@@ -88,6 +91,7 @@ curses/ascii.py
curses/has_key.py
curses/panel.py
curses/textpad.py
+dataclasses.py
datetime.py
dbm/__init__.py
dbm/dumb.py
@@ -333,7 +337,6 @@ http/cookies.py
http/server.py
idlelib/__init__.py
idlelib/__main__.py
-idlelib/_pyclbr.py
idlelib/autocomplete.py
idlelib/autocomplete_w.py
idlelib/autoexpand.py
@@ -398,6 +401,7 @@ importlib/_bootstrap.py
importlib/_bootstrap_external.py
importlib/abc.py
importlib/machinery.py
+importlib/resources.py
importlib/util.py
inspect.py
io.py
@@ -488,7 +492,6 @@ logging/config.py
logging/handlers.py
lzma.py
macpath.py
-macurl2path.py
mailbox.py
mailcap.py
mimetypes.py
diff --git a/pkg/python/rev b/pkg/python/rev
@@ -1 +1 @@
-8
+9
diff --git a/pkg/python/sha256 b/pkg/python/sha256
@@ -1 +1 @@
-f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6 Python-3.6.5.tar.xz
+0382996d1ee6aafe59763426cf0139ffebe36984474d0ec4126dd1c40a8b3549 Python-3.7.0.tar.xz
diff --git a/pkg/python/url b/pkg/python/url
@@ -1 +1 @@
-url = "https://www.python.org/ftp/python/3.6.5/Python-3.6.5.tar.xz"
+url = "https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tar.xz"
diff --git a/pkg/youtube-dl/gen.lua b/pkg/youtube-dl/gen.lua
@@ -1,6 +1,6 @@
file('bin/youtube-dl', '755', '$srcdir/bin/youtube-dl')
for f in iterlines('pylibs.txt') do
- file('lib/python3.6/'..f, '644', '$srcdir/'..f)
+ file('lib/python3.7/'..f, '644', '$srcdir/'..f)
end
fetch 'git'
