Merge pull request #173998 from mweinelt/cpython311
This commit is contained in:
commit
0b63d22aab
|
@ -0,0 +1,13 @@
|
|||
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
|
||||
index 40229bce0f..3cc604930e 100644
|
||||
--- a/Modules/posixmodule.c
|
||||
+++ b/Modules/posixmodule.c
|
||||
@@ -7258,7 +7258,7 @@ os_sched_getaffinity_impl(PyObject *module, pid_t pid)
|
||||
#ifdef HAVE_UTMP_H
|
||||
#include <utmp.h>
|
||||
#endif /* HAVE_UTMP_H */
|
||||
-#elif defined(HAVE_LIBUTIL_H)
|
||||
+#elif defined(HAVE_LIBUTIL_H) && !defined(__APPLE__)
|
||||
#include <libutil.h>
|
||||
#elif defined(HAVE_UTIL_H)
|
||||
#include <util.h>
|
|
@ -225,9 +225,11 @@ in with passthru; stdenv.mkDerivation {
|
|||
# * https://bugs.python.org/issue35523
|
||||
# * https://github.com/python/cpython/commit/e6b247c8e524
|
||||
./3.7/no-win64-workaround.patch
|
||||
] ++ optionals (pythonAtLeast "3.7") [
|
||||
] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [
|
||||
# Fix darwin build https://bugs.python.org/issue34027
|
||||
./3.7/darwin-libutil.patch
|
||||
] ++ optionals (pythonAtLeast "3.11") [
|
||||
./3.11/darwin-libutil.patch
|
||||
] ++ optionals (pythonOlder "3.8") [
|
||||
# Backport from CPython 3.8 of a good list of tests to run for PGO.
|
||||
(
|
||||
|
|
|
@ -199,9 +199,9 @@ in {
|
|||
major = "3";
|
||||
minor = "11";
|
||||
patch = "0";
|
||||
suffix = "a7";
|
||||
suffix = "b3";
|
||||
};
|
||||
sha256 = "sha256-t8Vt10wvRy1Ja1qNNWvWrZ75sD8mKIwyN9P/aYqwPXQ=";
|
||||
sha256 = "sha256-ybmfUxXqMPjp/LzmgHo3Oeh1SA0pEk5tmUD2+ry3yQI=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue