python{27,39,310,311,312,313,314}: drop Darwin `libutil` patch

Emily 22f2052c ee802060

Changed files
-45
pkgs
development
interpreters
-4
pkgs/development/interpreters/python/cpython/2.7/default.nix
···
] ++ lib.optionals (x11Support && stdenv.hostPlatform.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
-
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-
# Fix darwin build https://bugs.python.org/issue34027
-
../3.7/darwin-libutil.patch
-
] ++ lib.optionals stdenv.hostPlatform.isLinux [
# Disable the use of ldconfig in ctypes.util.find_library (since
-13
pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch
···
-
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>
-23
pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch
···
-
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
-
index c3682b4..16826c6 100644
-
--- a/Modules/posixmodule.c
-
+++ b/Modules/posixmodule.c
-
@@ -5880,15 +5880,13 @@ error:
-
#if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_DEV_PTMX)
-
#ifdef HAVE_PTY_H
-
#include <pty.h>
-
-#else
-
+#endif
-
#ifdef HAVE_LIBUTIL_H
-
#include <libutil.h>
-
-#else
-
+#endif
-
#ifdef HAVE_UTIL_H
-
#include <util.h>
-
-#endif /* HAVE_UTIL_H */
-
-#endif /* HAVE_LIBUTIL_H */
-
-#endif /* HAVE_PTY_H */
-
+#endif
-
#ifdef HAVE_STROPTS_H
-
#include <stropts.h>
-
#endif
-5
pkgs/development/interpreters/python/cpython/default.nix
···
] ++ optionals mimetypesSupport [
# Make the mimetypes module refer to the right file
./mimetypes.patch
-
] ++ 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 (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [
# Stop checking for TCL/TK in global macOS locations
./3.9/darwin-tcl-tk.patch