cpython: fetch darwin-libutil.patch to nixpkgs
python3 is now required buildInput for glibc>=2.29. Remove fetchpatch to solve infinite recursion in glibc bootstrap process.
This commit is contained in:
parent
e80a85a057
commit
76d90cf1f5
@ -0,0 +1,23 @@
|
||||
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
|
@ -103,10 +103,7 @@ in with passthru; stdenv.mkDerivation {
|
||||
./3.5/ld_library_path.patch
|
||||
] ++ optionals (isPy37 || isPy38) [
|
||||
# Fix darwin build https://bugs.python.org/issue34027
|
||||
(fetchpatch {
|
||||
url = https://bugs.python.org/file47666/darwin-libutil.patch;
|
||||
sha256 = "0242gihnw3wfskl4fydp2xanpl8k5q7fj4dp7dbbqf46a4iwdzpa";
|
||||
})
|
||||
./3.7/darwin-libutil.patch
|
||||
] ++ optionals (isPy3k && hasDistutilsCxxPatch) [
|
||||
# Fix for http://bugs.python.org/issue1222585
|
||||
# Upstream distutils is calling C compiler to compile C++ code, which
|
||||
|
Loading…
Reference in New Issue
Block a user