Skip to content
This repository was archived by the owner on Mar 30, 2019. It is now read-only.

Commit b34e9ca

Browse files
committed
Restored #undefs needed for tvOS and watchOS.
1 parent 3c4aede commit b34e9ca

File tree

1 file changed

+23
-8
lines changed

1 file changed

+23
-8
lines changed

patch/Python/Python.patch

+23-8
Original file line numberDiff line numberDiff line change
@@ -29037,7 +29037,7 @@ diff -Nru orig/Modules/mathmodule.c modified/Modules/mathmodule.c
2903729037
r = hypot(x, y);
2903829038
diff -Nru orig/Modules/posixmodule.c modified/Modules/posixmodule.c
2903929039
--- orig/Modules/posixmodule.c 2015-12-07 09:39:10.000000000 +0800
29040-
+++ modified/Modules/posixmodule.c 2016-02-17 09:05:04.000000000 +0800
29040+
+++ modified/Modules/posixmodule.c 2016-02-17 14:14:22.000000000 +0800
2904129041
@@ -20,6 +20,8 @@
2904229042
# pragma weak statvfs
2904329043
# pragma weak fstatvfs
@@ -29047,15 +29047,30 @@ diff -Nru orig/Modules/posixmodule.c modified/Modules/posixmodule.c
2904729047
#endif /* __APPLE__ */
2904829048

2904929049
#define PY_SSIZE_T_CLEAN
29050-
@@ -175,7 +177,6 @@
29050+
@@ -175,6 +177,22 @@
2905129051
#endif /* _MSC_VER */
2905229052
#endif /* ! __WATCOMC__ || __QNX__ */
2905329053

29054-
-
29054+
+// tvOS and watchOS don't provide a number of important POSIX functions.
29055+
+#if defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) || defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__)
29056+
+# undef HAVE_EXECV
29057+
+# undef HAVE_FORK
29058+
+# undef HAVE_FORK1
29059+
+# undef HAVE_FORKPTY
29060+
+# undef HAVE_GETGROUPS
29061+
+# undef HAVE_SCHED_H
29062+
+# undef HAVE_SENDFILE
29063+
+# undef HAVE_SETPRIORITY
29064+
+# undef HAVE_SPAWNV
29065+
+# undef HAVE_WAIT
29066+
+# undef HAVE_WAIT3
29067+
+# undef HAVE_WAIT4
29068+
+# undef HAVE_WAITPID
29069+
+#endif /* TVOS || WATCHOS */
29070+
2905529071
/*[clinic input]
2905629072
# one of the few times we lie about this name!
29057-
module os
29058-
@@ -1127,7 +1128,9 @@
29073+
@@ -1127,7 +1145,9 @@
2905929074
#include <crt_externs.h>
2906029075
static char **environ;
2906129076
#elif !defined(_MSC_VER) && ( !defined(__WATCOMC__) || defined(__QNX__) )
@@ -29065,7 +29080,7 @@ diff -Nru orig/Modules/posixmodule.c modified/Modules/posixmodule.c
2906529080
#endif /* !_MSC_VER */
2906629081

2906729082
static PyObject *
29068-
@@ -1178,7 +1181,7 @@
29083+
@@ -1178,7 +1198,7 @@
2906929084
Py_DECREF(k);
2907029085
Py_DECREF(v);
2907129086
}
@@ -29074,7 +29089,7 @@ diff -Nru orig/Modules/posixmodule.c modified/Modules/posixmodule.c
2907429089
if (environ == NULL)
2907529090
return d;
2907629091
/* This part ignores errors */
29077-
@@ -4285,7 +4288,12 @@
29092+
@@ -4285,7 +4305,12 @@
2907829093
long result;
2907929094
char *bytes = PyBytes_AsString(command);
2908029095
Py_BEGIN_ALLOW_THREADS
@@ -29170,7 +29185,7 @@ diff -Nru orig/Objects/bytesobject.c modified/Objects/bytesobject.c
2917029185
n++;
2917129186
diff -Nru orig/Python/importlib_external.h modified/Python/importlib_external.h
2917229187
--- orig/Python/importlib_external.h 2015-12-07 09:39:11.000000000 +0800
29173-
+++ modified/Python/importlib_external.h 2016-02-17 10:08:14.000000000 +0800
29188+
+++ modified/Python/importlib_external.h 2016-02-17 12:30:41.000000000 +0800
2917429189
@@ -2,52 +2,52 @@
2917529190
const unsigned char _Py_M__importlib_external[] = {
2917629191
99,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,

0 commit comments

Comments
 (0)