pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang
Module Name: pkgsrc
Committed By: adam
Date: Tue Dec 8 14:30:41 UTC 2020
Modified Files:
pkgsrc/lang/py39-html-docs: Makefile distinfo
pkgsrc/lang/python39: Makefile PLIST dist.mk distinfo
pkgsrc/lang/python39/patches: patch-configure patch-pyconfig.h.in
patch-setup.py
Removed Files:
pkgsrc/lang/python39/patches: patch-Lib___osx__support.py
patch-Lib_ctypes_macholib_dyld.py
patch-Lib_ctypes_test_test__macholib.py
patch-Lib_distutils_tests_test__build__ext.py
patch-Lib_test_test__bytes.py patch-Lib_test_test__platform.py
patch-Lib_test_test__unicode.py
patch-Mac_BuildScript_build-installer.py patch-Mac_Tools_pythonw.c
patch-Modules___ctypes_callbacks.c
patch-Modules___ctypes_callproc.c patch-Modules___ctypes_ctypes.h
patch-Modules___ctypes_malloc__closure.c
patch-Modules___decimal_libmpdec_mpdecimal.h
patch-Modules_getpath.c patch-Modules_posixmodule.c
patch-Modules_timemodule.c patch-Python_bootstrap__hash.c
patch-Python_pytime.c patch-configure.ac
Log Message:
python39: updated to 3.9.1
Python 3.9.1 final
Core and Builtins
bpo-42576: types.GenericAlias will now raise a TypeError when attempting to initialize with a keyword argument. Previously, this would cause the interpreter to crash if the interpreter was compiled
with debug symbols. This does not affect interpreters compiled for release. Patch by Ken Jin.
Library
bpo-5054: CGIHTTPRequestHandler.run_cgi() HTTP_ACCEPT improperly parsed. Replace the special purpose getallmatchingheaders with generic get_all method and add relevant tests.
bpo-17735: inspect.findsource() now raises OSError instead of IndexError when co_lineno of a code object is greater than the file length. This can happen, for example, when a file is edited after it
was imported.
bpo-42116: Fix handling of trailing comments by inspect.getsource().
bpo-42487: ChainMap.__iter__ no longer calls __getitem__ on underlying maps
bpo-42482: TracebackException no longer holds a reference to the exception’s traceback object. Consequently, instances of TracebackException for equivalent but non-equal exceptions now compare as
equal.
bpo-42406: We fixed an issue in pickle.whichmodule in which importing multiprocessing could change the how pickle identifies which module an object belongs to, potentially breaking the unpickling of
those objects.
bpo-34215: Clarify the error message for asyncio.IncompleteReadError when expected is None.
bpo-12800: Extracting a symlink from a tarball should succeed and overwrite the symlink if it already exists. The fix is to remove the existing file or symlink before extraction. Based on patch by
Chris AtLee, Jeffrey Kintscher, and Senthil Kumaran.
Tests
bpo-41473: Reenable test_gdb on gdb 9.2 and newer: https://bugzilla.redhat.com/show_bug.cgi?id=1866884 bug is fixed in gdb 10.1.
bpo-42553: Fix test_asyncio.test_call_later() race condition: don’t measure asyncio performance in the call_later() unit test. The test failed randomly on the CI.
macOS
bpo-41116: If no explicit macOS SDK was specified, setup.py should check for Tcl and TK frameworks in /Library/Frameworks; the previous commit inadvertently broke that test.
bpo-42504: Fix build on macOS Big Sur when MACOSX_DEPLOYMENT_TARGET=11
IDLE
bpo-42508: Keep IDLE running on macOS. Remove obsolete workaround that prevented running files with shortcuts when using new universal2 installers built on macOS 11.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/py39-html-docs/Makefile \
pkgsrc/lang/py39-html-docs/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/python39/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python39/PLIST \
pkgsrc/lang/python39/dist.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/python39/distinfo
cvs rdiff -u -r1.1 -r0 \
pkgsrc/lang/python39/patches/patch-Lib___osx__support.py \
pkgsrc/lang/python39/patches/patch-Lib_ctypes_macholib_dyld.py \
pkgsrc/lang/python39/patches/patch-Lib_ctypes_test_test__macholib.py \
pkgsrc/lang/python39/patches/patch-Lib_distutils_tests_test__build__ext.py \
pkgsrc/lang/python39/patches/patch-Lib_test_test__bytes.py \
pkgsrc/lang/python39/patches/patch-Lib_test_test__platform.py \
pkgsrc/lang/python39/patches/patch-Lib_test_test__unicode.py \
pkgsrc/lang/python39/patches/patch-Mac_BuildScript_build-installer.py \
pkgsrc/lang/python39/patches/patch-Mac_Tools_pythonw.c \
pkgsrc/lang/python39/patches/patch-Modules___ctypes_callbacks.c \
pkgsrc/lang/python39/patches/patch-Modules___ctypes_callproc.c \
pkgsrc/lang/python39/patches/patch-Modules___ctypes_ctypes.h \
pkgsrc/lang/python39/patches/patch-Modules___ctypes_malloc__closure.c \
pkgsrc/lang/python39/patches/patch-Modules___decimal_libmpdec_mpdecimal.h \
pkgsrc/lang/python39/patches/patch-Modules_getpath.c \
pkgsrc/lang/python39/patches/patch-Modules_posixmodule.c \
pkgsrc/lang/python39/patches/patch-Modules_timemodule.c \
pkgsrc/lang/python39/patches/patch-Python_bootstrap__hash.c \
pkgsrc/lang/python39/patches/patch-Python_pytime.c \
pkgsrc/lang/python39/patches/patch-configure.ac
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/python39/patches/patch-configure \
pkgsrc/lang/python39/patches/patch-pyconfig.h.in
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/python39/patches/patch-setup.py
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/py39-html-docs/Makefile
diff -u pkgsrc/lang/py39-html-docs/Makefile:1.1 pkgsrc/lang/py39-html-docs/Makefile:1.2
--- pkgsrc/lang/py39-html-docs/Makefile:1.1 Sat Oct 10 20:19:47 2020
+++ pkgsrc/lang/py39-html-docs/Makefile Tue Dec 8 14:30:40 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2020/10/10 20:19:47 adam Exp $
+# $NetBSD: Makefile,v 1.2 2020/12/08 14:30:40 adam Exp $
-VERS= 3.9.0
+VERS= 3.9.1
DISTNAME= python-${VERS}-docs-html
PKGNAME= py39-html-docs-${VERS}
CATEGORIES= lang python
Index: pkgsrc/lang/py39-html-docs/distinfo
diff -u pkgsrc/lang/py39-html-docs/distinfo:1.1 pkgsrc/lang/py39-html-docs/distinfo:1.2
--- pkgsrc/lang/py39-html-docs/distinfo:1.1 Sat Oct 10 20:19:47 2020
+++ pkgsrc/lang/py39-html-docs/distinfo Tue Dec 8 14:30:40 2020
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2020/10/10 20:19:47 adam Exp $
+$NetBSD: distinfo,v 1.2 2020/12/08 14:30:40 adam Exp $
-SHA1 (python-3.9.0-docs-html.tar.bz2) = 99704717879e3ee4040c2ac7b186b03a56577c8f
-RMD160 (python-3.9.0-docs-html.tar.bz2) = 3820fc22a919acdca355e56827ca5f87d90d0a70
-SHA512 (python-3.9.0-docs-html.tar.bz2) = d04957f4895ab8f6bef8467d8b5282e0b3e5c453e2168c25123ee7aefd7a3d6d8b918e9f455bbf82913370a00181b8c00998ec2ae67c763aeda237c5b3a42097
-Size (python-3.9.0-docs-html.tar.bz2) = 6771373 bytes
+SHA1 (python-3.9.1-docs-html.tar.bz2) = ab7f5ea13f67b0c7e639964d4be3a83a3c72b35a
+RMD160 (python-3.9.1-docs-html.tar.bz2) = 172b697e3dad6da7b183124b86b4ce08f1c00db6
+SHA512 (python-3.9.1-docs-html.tar.bz2) = aa87b27b895894281b923031af651d26627526f85e61fe09c88be081ff6471ae367364cea176b1e522e065c6ec98372504f769aa1d40382716004f90c3761d97
+Size (python-3.9.1-docs-html.tar.bz2) = 6806786 bytes
Index: pkgsrc/lang/python39/Makefile
diff -u pkgsrc/lang/python39/Makefile:1.5 pkgsrc/lang/python39/Makefile:1.6
--- pkgsrc/lang/python39/Makefile:1.5 Mon Dec 7 13:14:39 2020
+++ pkgsrc/lang/python39/Makefile Tue Dec 8 14:30:40 2020
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2020/12/07 13:14:39 nia Exp $
+# $NetBSD: Makefile,v 1.6 2020/12/08 14:30:40 adam Exp $
.include "dist.mk"
PKGNAME= python39-${PY_DISTVERSION}
-PKGREVISION= 1
CATEGORIES= lang python
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -65,17 +64,10 @@ PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:
.endif
PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
-# ossaudiodev is only available on x86 for the following platforms
-PLIST_VARS+= oss
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
- (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD")
-PLIST.oss= yes
-.endif
-
# For Xcode 5 and up, we need to search the SDK path for headers, otherwise
# certain modules will not be built.
.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include)
-CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include
+CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include
.endif
PLIST_VARS+= nis
Index: pkgsrc/lang/python39/PLIST
diff -u pkgsrc/lang/python39/PLIST:1.1 pkgsrc/lang/python39/PLIST:1.2
--- pkgsrc/lang/python39/PLIST:1.1 Sat Oct 10 20:19:47 2020
+++ pkgsrc/lang/python39/PLIST Tue Dec 8 14:30:40 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/10/10 20:19:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/12/08 14:30:40 adam Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -1419,7 +1419,6 @@ lib/python${PY_VER_SUFFIX}/ensurepip/__m
lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/__init__.py
lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/__init__.pyc
lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/__init__.pyo
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-20.2.1-py2.py3-none-any.whl
lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-20.2.3-py2.py3-none-any.whl
lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-49.2.1-py3-none-any.whl
lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.py
@@ -3281,6 +3280,9 @@ lib/python${PY_VER_SUFFIX}/test/test_asy
lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_futures.py
lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_futures.pyc
lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_futures.pyo
+lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_futures2.py
+lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_futures2.pyc
+lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_futures2.pyo
lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_locks.py
lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_locks.pyc
lib/python${PY_VER_SUFFIX}/test/test_asyncio/test_locks.pyo
Index: pkgsrc/lang/python39/dist.mk
diff -u pkgsrc/lang/python39/dist.mk:1.1 pkgsrc/lang/python39/dist.mk:1.2
--- pkgsrc/lang/python39/dist.mk:1.1 Sat Oct 10 20:19:47 2020
+++ pkgsrc/lang/python39/dist.mk Tue Dec 8 14:30:40 2020
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.1 2020/10/10 20:19:47 adam Exp $
+# $NetBSD: dist.mk,v 1.2 2020/12/08 14:30:40 adam Exp $
-PY_DISTVERSION= 3.9.0
+PY_DISTVERSION= 3.9.1
DISTNAME= Python-${PY_DISTVERSION}
EXTRACT_SUFX= .tar.xz
DISTINFO_FILE= ${.CURDIR}/../../lang/python39/distinfo
Index: pkgsrc/lang/python39/distinfo
diff -u pkgsrc/lang/python39/distinfo:1.4 pkgsrc/lang/python39/distinfo:1.5
--- pkgsrc/lang/python39/distinfo:1.4 Thu Nov 19 16:29:42 2020
+++ pkgsrc/lang/python39/distinfo Tue Dec 8 14:30:40 2020
@@ -1,42 +1,22 @@
-$NetBSD: distinfo,v 1.4 2020/11/19 16:29:42 bsiegert Exp $
+$NetBSD: distinfo,v 1.5 2020/12/08 14:30:40 adam Exp $
-SHA1 (Python-3.9.0.tar.xz) = ff1fc8c37d5d4b09ec3bf0d84f3e5b97745c6704
-RMD160 (Python-3.9.0.tar.xz) = 822fd1ea11f3ca303a08317f6db61f2a1e03e5ef
-SHA512 (Python-3.9.0.tar.xz) = b141039c9701a8cb0d15cd11a279153077524af4d0599e7d2c7279d4c18d05fda06b33ef82342d875de996c7117b7dc6eb154dc3669d38a1efa99801aeec6c5e
-Size (Python-3.9.0.tar.xz) = 18866140 bytes
-SHA1 (patch-Lib___osx__support.py) = 4ccccb81381cd7bf4a8bbc3e376d1234cf2266d5
-SHA1 (patch-Lib_ctypes_macholib_dyld.py) = d7f3e0c63d6926db253fbe923dd97995478d528c
-SHA1 (patch-Lib_ctypes_test_test__macholib.py) = bd887357759975b7a497c4079bc730e9c578ceed
+SHA1 (Python-3.9.1.tar.xz) = 77f4105846f6740297e50d7535a42c02d6b8e7db
+RMD160 (Python-3.9.1.tar.xz) = 59e056f957252a03c83ce892ac0ef85a274fce58
+SHA512 (Python-3.9.1.tar.xz) = b90029d6825751685983e9dcf0e0ec9e46f18e6c7d37b0dd7a245a94316f8c0090308ad7c2b2b49ed2514b0b909177231dd5bcad03031bf4624e37136fcf8019
+Size (Python-3.9.1.tar.xz) = 18897104 bytes
SHA1 (patch-Lib_ctypes_util.py) = 032cc99ebad93ddddfd89073c60424a952e3faa3
SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee932c3a341
SHA1 (patch-Lib_distutils_sysconfig.py) = 6822eafb4dfded86d7f7353831816aeb8119e6cf
-SHA1 (patch-Lib_distutils_tests_test__build__ext.py) = 145a0f01b3602c582e033081a35d4d86245575f9
SHA1 (patch-Lib_distutils_unixccompiler.py) = 2e65a8dd5dd3fe25957206c062106fa7a6fc4e69
SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = 5d6dab14197f27363394ff1aeee22a8ced8026d2
SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c
-SHA1 (patch-Lib_test_test__bytes.py) = 72559fdcb09f2c0b0c7b62649c249775d359d72e
-SHA1 (patch-Lib_test_test__platform.py) = 36311733729ac95159b3177dc0c16e6f4aa2f2b9
-SHA1 (patch-Lib_test_test__unicode.py) = 14fe4dd1011dbe262459f735a643774e0d38c99e
-SHA1 (patch-Mac_BuildScript_build-installer.py) = 24641c70facfded736ccc2be069d0e2ae63f63fd
-SHA1 (patch-Mac_Tools_pythonw.c) = fe128efe942853f0825c1a1fa17842201716dfdf
SHA1 (patch-Makefile.pre.in) = d42f9f5bca1dd663f64122dc95b49111452fe6e8
-SHA1 (patch-Modules___ctypes_callbacks.c) = 95750090d396a647fc12f7f7fad8c591ca4dcdec
-SHA1 (patch-Modules___ctypes_callproc.c) = 86f27c466a67ebf72d863febece33aa8b1f9f719
-SHA1 (patch-Modules___ctypes_ctypes.h) = 641c0af4d550c9140549ce2f2df6239c2c954a06
-SHA1 (patch-Modules___ctypes_malloc__closure.c) = 7e8f491ce66acb6d07e8830ee881edbf0aaac538
-SHA1 (patch-Modules___decimal_libmpdec_mpdecimal.h) = 8d302abacc5737fe7620d4738fff6c5c3ed387c7
SHA1 (patch-Modules___zoneinfo.c) = b1df24fe935cd357670a6d9f41245ab04f2015e8
-SHA1 (patch-Modules_getpath.c) = d7114d21d7d9c7167fad259b115cb02e4153c531
SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
-SHA1 (patch-Modules_posixmodule.c) = c592ef4ebe650f672a15ff9887cbeed2ca73b666
SHA1 (patch-Modules_socketmodule.c) = 02c447f980a08e2185df78d2f13373574f414304
SHA1 (patch-Modules_socketmodule.h) = 61fe96a79d4ccf3e7768eb79dd7e29a50a85328b
-SHA1 (patch-Modules_timemodule.c) = 8c8e9e43b6d165c1a7df6142a6bcd430003ed165
-SHA1 (patch-Python_bootstrap__hash.c) = cbc2839675182a344591ba672187b166f166499b
-SHA1 (patch-Python_pytime.c) = 1bb39b7060c1f337562208dc6611672eaf2f586b
SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
-SHA1 (patch-configure) = 371a65a2cb10fe7709d30a16358b48bc2e0a4aa6
-SHA1 (patch-configure.ac) = 4ce75ef922e015adf095cb481c829b11c0454efe
-SHA1 (patch-pyconfig.h.in) = 7c1c997c089f882fbd334b81c04a03dbaebb2c41
-SHA1 (patch-setup.py) = ab1a7cb97fb8718d21f07f8c896b7de660189c67
+SHA1 (patch-configure) = 2339ccb9041171f304286b2ee3cf711c7569a7a7
+SHA1 (patch-pyconfig.h.in) = 2f06af7358690b46eaff404226b898962b049a0e
+SHA1 (patch-setup.py) = 0ea2e4183f7c11ff893ca302aafe8bb9bea80d6c
Index: pkgsrc/lang/python39/patches/patch-configure
diff -u pkgsrc/lang/python39/patches/patch-configure:1.2 pkgsrc/lang/python39/patches/patch-configure:1.3
--- pkgsrc/lang/python39/patches/patch-configure:1.2 Thu Nov 12 10:58:21 2020
+++ pkgsrc/lang/python39/patches/patch-configure Tue Dec 8 14:30:40 2020
@@ -1,34 +1,13 @@
-$NetBSD: patch-configure,v 1.2 2020/11/12 10:58:21 sjmulder Exp $
+$NetBSD: patch-configure,v 1.3 2020/12/08 14:30:40 adam Exp $
- - Use gnu99 instead of c99 to avoid "alloca() undefined" problems.
- - Fix linking on Darwin; don't use -stack_size.
- - Changes for consistency across pkgsrc platforms.
- - Simplify _sysconfigdata to include only platform name.
- - Support for macOS 11 and Apple Silicon (ARM). Backported from:
- https://github.com/python/cpython/pull/22855
+Use gnu99 instead of c99 to avoid "alloca() undefined" problems.
+Fix linking on Darwin; don't use -stack_size.
+Changes for consistency across pkgsrc platforms.
+Simplify _sysconfigdata to include only platform name.
---- configure.orig 2020-10-05 15:07:58.000000000 +0000
+--- configure.orig 2020-12-07 14:02:38.000000000 +0000
+++ configure
-@@ -1510,8 +1510,8 @@ Optional Packages:
- specify the kind of universal binary that should be
- created. this option is only valid when
- --enable-universalsdk is set; options are:
-- ("32-bit", "64-bit", "3-way", "intel", "intel-32",
-- "intel-64", or "all") see Mac/README.rst
-+ ("universal2", "32-bit", "64-bit", "3-way", "intel",
-+ "intel-32", "intel-64", or "all") see Mac/README.rst
- --with-framework-name=FRAMEWORK
- specify the name for the python framework on macOS
- only valid when --enable-framework is set. see
-@@ -6954,14 +6954,14 @@ fi
-
-
-
--# The -arch flags for universal builds on OSX
-+# The -arch flags for universal builds on macOS
- UNIVERSAL_ARCH_FLAGS=
-
-
+@@ -6961,7 +6961,7 @@ UNIVERSAL_ARCH_FLAGS=
# tweak BASECFLAGS based on compiler and platform
case $GCC in
yes)
@@ -37,51 +16,7 @@ $NetBSD: patch-configure,v 1.2 2020/11/1
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
$as_echo_n "checking for -Wextra... " >&6; }
-@@ -7481,6 +7481,11 @@ $as_echo "$CC" >&6; }
- LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
- ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
- ;;
-+ universal2)
-+ UNIVERSAL_ARCH_FLAGS="-arch arm64 -arch x86_64"
-+ LIPO_32BIT_FLAGS=""
-+ ARCH_RUN_32BIT="true"
-+ ;;
- intel)
- UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
- LIPO_32BIT_FLAGS="-extract i386"
-@@ -7502,7 +7507,7 @@ $as_echo "$CC" >&6; }
- ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
- ;;
- *)
-- as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
-+ as_fn_error $? "proper usage is --with-universal-arch=universal2|32-bit|64-bit|all|intel|3-way" "$LINENO" 5
- ;;
- esac
-
-@@ -9334,7 +9339,7 @@ fi
- MACOSX_DEFAULT_ARCH="ppc"
- ;;
- *)
-- as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
-+ as_fn_error $? "Unexpected output of 'arch' on macOS" "$LINENO" 5
- ;;
- esac
- else
-@@ -9344,9 +9349,12 @@ fi
- ;;
- ppc)
- MACOSX_DEFAULT_ARCH="ppc64"
-+ ;;
-+ arm64)
-+ MACOSX_DEFAULT_ARCH="arm64"
- ;;
- *)
-- as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
-+ as_fn_error $? "Unexpected output of 'arch' on macOS" "$LINENO" 5
- ;;
- esac
-
-@@ -9617,7 +9625,6 @@ then
+@@ -9650,7 +9650,6 @@ then
# to ensure that tests don't crash
# Note: This matches the value of THREAD_STACK_SIZE in
# thread_pthread.h
@@ -89,39 +24,7 @@ $NetBSD: patch-configure,v 1.2 2020/11/1
if test "$enable_framework"
then
-@@ -11989,6 +11996,31 @@ $as_echo "no" >&6; }
-
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _dyld_shared_cache_contains_path" >&5
-+$as_echo_n "checking for _dyld_shared_cache_contains_path... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <mach-o/dyld.h>
-+int
-+main ()
-+{
-+void *x=_dyld_shared_cache_contains_path
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+$as_echo "#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH 1" >>confdefs.h
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for memfd_create" >&5
- $as_echo_n "checking for memfd_create... " >&6; }
-@@ -14437,10 +14469,10 @@ _ACEOF
+@@ -14495,10 +14494,10 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
@@ -134,7 +37,7 @@ $NetBSD: patch-configure,v 1.2 2020/11/1
if test "$ax_cv_c_float_words_bigendian" = unknown; then
ax_cv_c_float_words_bigendian=no
else
-@@ -15326,8 +15358,6 @@ fi
+@@ -15384,8 +15383,6 @@ fi
case $ac_sys_system in
@@ -143,7 +46,7 @@ $NetBSD: patch-configure,v 1.2 2020/11/1
*)
EXT_SUFFIX=${SHLIB_SUFFIX};;
esac
-@@ -15383,11 +15413,7 @@ fi
+@@ -15441,11 +15438,7 @@ fi
Index: pkgsrc/lang/python39/patches/patch-pyconfig.h.in
diff -u pkgsrc/lang/python39/patches/patch-pyconfig.h.in:1.2 pkgsrc/lang/python39/patches/patch-pyconfig.h.in:1.3
--- pkgsrc/lang/python39/patches/patch-pyconfig.h.in:1.2 Thu Nov 12 10:58:21 2020
+++ pkgsrc/lang/python39/patches/patch-pyconfig.h.in Tue Dec 8 14:30:40 2020
@@ -1,8 +1,6 @@
-$NetBSD: patch-pyconfig.h.in,v 1.2 2020/11/12 10:58:21 sjmulder Exp $
+$NetBSD: patch-pyconfig.h.in,v 1.3 2020/12/08 14:30:40 adam Exp $
- - detect netcan/can.h on NetBSD
- - Support for macOS 11 and Apple Silicon (ARM). Backported from:
- https://github.com/python/cpython/pull/22855
+Detect netcan/can.h on NetBSD
--- pyconfig.h.in.orig 2020-10-05 15:07:58.000000000 +0000
+++ pyconfig.h.in
@@ -16,13 +14,3 @@ $NetBSD: patch-pyconfig.h.in,v 1.2 2020/
/* Define to 1 if you have the <linux/netlink.h> header file. */
#undef HAVE_LINUX_NETLINK_H
-@@ -778,6 +781,9 @@
- /* Define if you have the 'prlimit' functions. */
- #undef HAVE_PRLIMIT
-
-+/* Define if you have the '_dyld_shared_cache_contains_path' function. */
-+#undef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH
-+
- /* Define to 1 if you have the <process.h> header file. */
- #undef HAVE_PROCESS_H
-
Index: pkgsrc/lang/python39/patches/patch-setup.py
diff -u pkgsrc/lang/python39/patches/patch-setup.py:1.3 pkgsrc/lang/python39/patches/patch-setup.py:1.4
--- pkgsrc/lang/python39/patches/patch-setup.py:1.3 Thu Nov 19 16:29:42 2020
+++ pkgsrc/lang/python39/patches/patch-setup.py Tue Dec 8 14:30:40 2020
@@ -1,16 +1,14 @@
-$NetBSD: patch-setup.py,v 1.3 2020/11/19 16:29:42 bsiegert Exp $
+$NetBSD: patch-setup.py,v 1.4 2020/12/08 14:30:40 adam Exp $
- - Disable certain modules, so they can be built as separate packages.
- - Do not look for ncursesw.
- - Assume panel_library is correct; this is a fix for ncurses' gnupanel
- which will get transformed to panel in buildlink.
- - Also look for uuid/uuid.h.
- - Support for macOS 11 and Apple Silicon (ARM). Backported from:
- https://github.com/python/cpython/pull/22855
+Disable certain modules, so they can be built as separate packages.
+Do not look for ncursesw.
+Assume panel_library is correct; this is a fix for ncurses' gnupanel
+which will get transformed to panel in buildlink.
+Also look for uuid/uuid.h.
---- setup.py.orig 2020-10-05 15:07:58.000000000 +0000
+--- setup.py.orig 2020-12-07 14:02:38.000000000 +0000
+++ setup.py
-@@ -29,7 +29,7 @@ except ImportError:
+@@ -30,7 +30,7 @@ except ImportError:
SUBPROCESS_BOOTSTRAP = True
@@ -19,7 +17,7 @@ $NetBSD: patch-setup.py,v 1.3 2020/11/19
from distutils.command.build_ext import build_ext
from distutils.command.build_scripts import build_scripts
from distutils.command.install import install
-@@ -43,7 +43,7 @@ from distutils.spawn import find_executa
+@@ -44,7 +44,7 @@ from distutils.spawn import find_executa
TEST_EXTENSIONS = True
# This global variable is used to hold the list of modules to be disabled.
@@ -28,9 +26,9 @@ $NetBSD: patch-setup.py,v 1.3 2020/11/19
def get_platform():
-@@ -239,6 +239,16 @@ def is_macosx_sdk_path(path):
- or path.startswith('/Library/') )
-
+@@ -224,6 +224,16 @@ def grep_headers_for(function, headers):
+ return True
+ return False
+def grep_headers_for(function, headers):
+ for header in headers:
@@ -45,7 +43,7 @@ $NetBSD: patch-setup.py,v 1.3 2020/11/19
def find_file(filename, std_dirs, paths):
"""Searches for the directory where a given file is located,
and returns a possibly-empty list of additional directories, or None
-@@ -740,15 +750,15 @@ class PyBuildExt(build_ext):
+@@ -725,15 +735,15 @@ class PyBuildExt(build_ext):
add_dir_to_list(dir_list, directory)
def configure_compiler(self):
@@ -70,7 +68,7 @@ $NetBSD: patch-setup.py,v 1.3 2020/11/19
self.add_multiarch_paths()
self.add_ldflags_cppflags()
-@@ -796,6 +806,9 @@ class PyBuildExt(build_ext):
+@@ -781,6 +791,9 @@ class PyBuildExt(build_ext):
self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
if MACOS:
@@ -80,7 +78,7 @@ $NetBSD: patch-setup.py,v 1.3 2020/11/19
# This should work on any unixy platform ;-)
# If the user has bothered specifying additional -I and -L flags
# in OPT and LDFLAGS we might as well use them here.
-@@ -1013,8 +1026,6 @@ class PyBuildExt(build_ext):
+@@ -998,8 +1011,6 @@ class PyBuildExt(build_ext):
# use the same library for the readline and curses modules.
if 'curses' in readline_termcap_library:
curses_library = readline_termcap_library
@@ -89,7 +87,7 @@ $NetBSD: patch-setup.py,v 1.3 2020/11/19
# Issue 36210: OSS provided ncurses does not link on AIX
# Use IBM supplied 'curses' for successful build of _curses
elif AIX and self.compiler.find_library_file(self.lib_dirs, 'curses'):
-@@ -1116,8 +1127,7 @@ class PyBuildExt(build_ext):
+@@ -1101,8 +1112,7 @@ class PyBuildExt(build_ext):
# If the curses module is enabled, check for the panel module
# _curses_panel needs some form of ncurses
skip_curses_panel = True if AIX else False
@@ -99,7 +97,7 @@ $NetBSD: patch-setup.py,v 1.3 2020/11/19
self.add(Extension('_curses_panel', ['_curses_panel.c'],
include_dirs=curses_includes,
define_macros=curses_defines,
-@@ -1368,6 +1378,31 @@ class PyBuildExt(build_ext):
+@@ -1353,6 +1363,31 @@ class PyBuildExt(build_ext):
dbm_order = ['gdbm']
# The standard Unix dbm module:
if not CYGWIN:
@@ -131,7 +129,7 @@ $NetBSD: patch-setup.py,v 1.3 2020/11/19
config_args = [arg.strip("'")
for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
dbm_args = [arg for arg in config_args
-@@ -1379,7 +1414,7 @@ class PyBuildExt(build_ext):
+@@ -1364,7 +1399,7 @@ class PyBuildExt(build_ext):
dbmext = None
for cand in dbm_order:
if cand == "ndbm":
@@ -140,7 +138,7 @@ $NetBSD: patch-setup.py,v 1.3 2020/11/19
# Some systems have -lndbm, others have -lgdbm_compat,
# others don't have either
if self.compiler.find_library_file(self.lib_dirs,
-@@ -1779,6 +1814,8 @@ class PyBuildExt(build_ext):
+@@ -1764,6 +1799,8 @@ class PyBuildExt(build_ext):
def detect_uuid(self):
# Build the _uuid module if possible
uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
@@ -149,133 +147,7 @@ $NetBSD: patch-setup.py,v 1.3 2020/11/19
if uuid_incs is not None:
if self.compiler.find_library_file(self.lib_dirs, 'uuid'):
uuid_libs = ['uuid']
-@@ -2101,43 +2138,17 @@ class PyBuildExt(build_ext):
- library_dirs=added_lib_dirs))
- return True
-
-- def configure_ctypes_darwin(self, ext):
-- # Darwin (OS X) uses preconfigured files, in
-- # the Modules/_ctypes/libffi_osx directory.
-- ffi_srcdir = os.path.abspath(os.path.join(self.srcdir, 'Modules',
-- '_ctypes', 'libffi_osx'))
-- sources = [os.path.join(ffi_srcdir, p)
-- for p in ['ffi.c',
-- 'x86/darwin64.S',
-- 'x86/x86-darwin.S',
-- 'x86/x86-ffi_darwin.c',
-- 'x86/x86-ffi64.c',
-- 'powerpc/ppc-darwin.S',
-- 'powerpc/ppc-darwin_closure.S',
-- 'powerpc/ppc-ffi_darwin.c',
-- 'powerpc/ppc64-darwin_closure.S',
-- ]]
--
-- # Add .S (preprocessed assembly) to C compiler source extensions.
-- self.compiler.src_extensions.append('.S')
--
-- include_dirs = [os.path.join(ffi_srcdir, 'include'),
-- os.path.join(ffi_srcdir, 'powerpc')]
-- ext.include_dirs.extend(include_dirs)
-- ext.sources.extend(sources)
-- return True
--
- def configure_ctypes(self, ext):
-- if not self.use_system_libffi:
-- if MACOS:
-- return self.configure_ctypes_darwin(ext)
-- print('INFO: Could not locate ffi libs and/or headers')
-- return False
- return True
-
- def detect_ctypes(self):
- # Thomas Heller's _ctypes module
-- self.use_system_libffi = False
-+
-+ if (not sysconfig.get_config_var("LIBFFI_INCLUDEDIR") and MACOS):
-+ self.use_system_libffi = True
-+ else:
-+ self.use_system_libffi = '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS")
-+
- include_dirs = []
- extra_compile_args = ['-DPy_BUILD_CORE_MODULE']
- extra_link_args = []
-@@ -2150,11 +2161,9 @@ class PyBuildExt(build_ext):
-
- if MACOS:
- sources.append('_ctypes/malloc_closure.c')
-- sources.append('_ctypes/darwin/dlfcn_simple.c')
-+ extra_compile_args.append('-DUSING_MALLOC_CLOSURE_DOT_C=1')
- extra_compile_args.append('-DMACOSX')
- include_dirs.append('_ctypes/darwin')
-- # XXX Is this still needed?
-- # extra_link_args.extend(['-read_only_relocs', 'warning'])
-
- elif HOST_PLATFORM == 'sunos5':
- # XXX This shouldn't be necessary; it appears that some
-@@ -2184,31 +2193,48 @@ class PyBuildExt(build_ext):
- sources=['_ctypes/_ctypes_test.c'],
- libraries=['m']))
-
-+ ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR")
-+ ffi_lib = None
-+
- ffi_inc_dirs = self.inc_dirs.copy()
- if MACOS:
-- if '--with-system-ffi' not in sysconfig.get_config_var("CONFIG_ARGS"):
-- return
-- # OS X 10.5 comes with libffi.dylib; the include files are
-- # in /usr/include/ffi
-- ffi_inc_dirs.append('/usr/include/ffi')
--
-- ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
-- if not ffi_inc or ffi_inc[0] == '':
-- ffi_inc = find_file('ffi.h', [], ffi_inc_dirs)
-- if ffi_inc is not None:
-- ffi_h = ffi_inc[0] + '/ffi.h'
-+ ffi_in_sdk = os.path.join(macosx_sdk_root(), "usr/include/ffi")
-+
-+ if not ffi_inc:
-+ if os.path.exists(ffi_in_sdk):
-+ ext.extra_compile_args.append("-DUSING_APPLE_OS_LIBFFI=1")
-+ ffi_inc = ffi_in_sdk
-+ ffi_lib = 'ffi'
-+ else:
-+ # OS X 10.5 comes with libffi.dylib; the include files are
-+ # in /usr/include/ffi
-+ ffi_inc_dirs.append('/usr/include/ffi')
-+
-+ if not ffi_inc:
-+ found = find_file('ffi.h', [], ffi_inc_dirs)
-+ if found:
-+ ffi_inc = found[0]
-+ if ffi_inc:
-+ ffi_h = ffi_inc + '/ffi.h'
- if not os.path.exists(ffi_h):
- ffi_inc = None
- print('Header file {} does not exist'.format(ffi_h))
-- ffi_lib = None
-- if ffi_inc is not None:
-+ if ffi_lib is None and ffi_inc:
- for lib_name in ('ffi', 'ffi_pic'):
- if (self.compiler.find_library_file(self.lib_dirs, lib_name)):
- ffi_lib = lib_name
- break
-
- if ffi_inc and ffi_lib:
-- ext.include_dirs.extend(ffi_inc)
-+ ffi_headers = glob(os.path.join(ffi_inc, '*.h'))
-+ if grep_headers_for('ffi_prep_cif_var', ffi_headers):
-+ ext.extra_compile_args.append("-DHAVE_FFI_PREP_CIF_VAR=1")
-+ if grep_headers_for('ffi_prep_closure_loc', ffi_headers):
-+ ext.extra_compile_args.append("-DHAVE_FFI_PREP_CLOSURE_LOC=1")
-+ if grep_headers_for('ffi_closure_alloc', ffi_headers):
-+ ext.extra_compile_args.append("-DHAVE_FFI_CLOSURE_ALLOC=1")
-+
-+ ext.include_dirs.append(ffi_inc)
- ext.libraries.append(ffi_lib)
- self.use_system_libffi = True
-
-@@ -2226,10 +2252,7 @@ class PyBuildExt(build_ext):
+@@ -2200,10 +2237,7 @@ class PyBuildExt(build_ext):
sources = ['_decimal/_decimal.c']
depends = ['_decimal/docstrings.h']
else:
@@ -287,7 +159,7 @@ $NetBSD: patch-setup.py,v 1.3 2020/11/19
libraries = ['m']
sources = [
'_decimal/_decimal.c',
-@@ -2609,7 +2632,7 @@ def main():
+@@ -2583,7 +2617,7 @@ def main():
# If you change the scripts installed here, you also need to
# check the PyBuildScripts command above, and change the links
# created by the bininstall target in Makefile.pre.in
Home |
Main Index |
Thread Index |
Old Index