Fredrik Fornwall
8 years ago
10 changed files with 16 additions and 109 deletions
@ -1,30 +0,0 @@ |
|||||
From https://github.com/kivy/python-for-android/blob/master/recipes/python/patches/fix-dlfcn.patch |
|
||||
|
|
||||
See https://github.com/kivy/python-for-android/issues/141 |
|
||||
diff -u -r ../Python-3.4.0rc1/Lib/plat-linux/DLFCN.py ./Lib/plat-linux/DLFCN.py |
|
||||
--- ../Python-3.4.0rc1/Lib/plat-linux/DLFCN.py 2014-02-10 23:51:49.000000000 +0100 |
|
||||
+++ ./Lib/plat-linux/DLFCN.py 2014-02-13 03:25:19.000000000 +0100 |
|
||||
@@ -74,10 +74,18 @@ |
|
||||
# Included from gnu/stubs.h |
|
||||
|
|
||||
# Included from bits/dlfcn.h |
|
||||
+ |
|
||||
+# PATCHED FOR ANDROID (the only supported symbols are, for 32-bit): |
|
||||
+# enum { |
|
||||
+# RTLD_NOW = 0, |
|
||||
+# RTLD_LAZY = 1, |
|
||||
+# RTLD_LOCAL = 0, |
|
||||
+# RTLD_GLOBAL = 2, |
|
||||
+# }; |
|
||||
RTLD_LAZY = 0x00001 |
|
||||
-RTLD_NOW = 0x00002 |
|
||||
-RTLD_BINDING_MASK = 0x3 |
|
||||
-RTLD_NOLOAD = 0x00004 |
|
||||
-RTLD_GLOBAL = 0x00100 |
|
||||
+RTLD_NOW = 0x00000 |
|
||||
+RTLD_BINDING_MASK = 0x0 |
|
||||
+RTLD_NOLOAD = 0x00004 |
|
||||
+RTLD_GLOBAL = 0x00002 |
|
||||
RTLD_LOCAL = 0 |
|
||||
-RTLD_NODELETE = 0x01000 |
|
||||
+RTLD_NODELETE = 0x00000 |
|
@ -1,30 +0,0 @@ |
|||||
From https://github.com/kivy/python-for-android/blob/master/recipes/python/patches/fix-dlfcn.patch |
|
||||
|
|
||||
See https://github.com/kivy/python-for-android/issues/141 |
|
||||
diff -u -r ../Python-3.4.0rc1/Lib/plat-linux/DLFCN.py ./Lib/plat-linux/DLFCN.py |
|
||||
--- ../Python-3.4.0rc1/Lib/plat-linux/DLFCN.py 2014-02-10 23:51:49.000000000 +0100 |
|
||||
+++ ./Lib/plat-linux/DLFCN.py 2014-02-13 03:25:19.000000000 +0100 |
|
||||
@@ -74,10 +74,18 @@ |
|
||||
# Included from gnu/stubs.h |
|
||||
|
|
||||
# Included from bits/dlfcn.h |
|
||||
+ |
|
||||
+# PATCHED FOR ANDROID (the only supported symbols are, for 64-bit): |
|
||||
+# enum { |
|
||||
+# RTLD_NOW = 2, |
|
||||
+# RTLD_LAZY = 1, |
|
||||
+# RTLD_LOCAL = 0, |
|
||||
+# RTLD_GLOBAL = 0x00100, |
|
||||
+# }; |
|
||||
RTLD_LAZY = 0x00001 |
|
||||
-RTLD_NOW = 0x00002 |
|
||||
-RTLD_BINDING_MASK = 0x3 |
|
||||
-RTLD_NOLOAD = 0x00004 |
|
||||
-RTLD_GLOBAL = 0x00100 |
|
||||
+RTLD_NOW = 0x00002 |
|
||||
+RTLD_BINDING_MASK = 0x0 |
|
||||
+RTLD_NOLOAD = 0x00004 |
|
||||
+RTLD_GLOBAL = 0x00100 |
|
||||
RTLD_LOCAL = 0 |
|
||||
-RTLD_NODELETE = 0x01000 |
|
||||
+RTLD_NODELETE = 0x00000 |
|
@ -1,12 +0,0 @@ |
|||||
diff -u -r ../Python-3.4.1/Modules/posixmodule.c ./Modules/posixmodule.c
|
|
||||
--- ../Python-3.4.1/Modules/posixmodule.c 2014-05-19 07:19:39.000000000 +0200
|
|
||||
+++ ./Modules/posixmodule.c 2014-06-25 21:42:11.191524129 +0200
|
|
||||
@@ -6048,7 +6048,7 @@
|
|
||||
if (_Py_set_inheritable(master_fd, 0, NULL) < 0) |
|
||||
goto posix_error; |
|
||||
|
|
||||
-#if !defined(__CYGWIN__) && !defined(HAVE_DEV_PTC)
|
|
||||
+#if !defined(__CYGWIN__) && !defined(HAVE_DEV_PTC) && !defined(__ANDROID__)
|
|
||||
ioctl(slave_fd, I_PUSH, "ptem"); /* push ptem */ |
|
||||
ioctl(slave_fd, I_PUSH, "ldterm"); /* push ldterm */ |
|
||||
#ifndef __hpux |
|
@ -1,16 +0,0 @@ |
|||||
diff -u -r ../Python-3.4.0rc1/Modules/pwdmodule.c ./Modules/pwdmodule.c
|
|
||||
--- ../Python-3.4.0rc1/Modules/pwdmodule.c 2014-02-10 23:51:50.000000000 +0100
|
|
||||
+++ ./Modules/pwdmodule.c 2014-02-13 02:16:12.000000000 +0100
|
|
||||
@@ -72,7 +72,12 @@
|
|
||||
SETS(setIndex++, p->pw_passwd); |
|
||||
PyStructSequence_SET_ITEM(v, setIndex++, _PyLong_FromUid(p->pw_uid)); |
|
||||
PyStructSequence_SET_ITEM(v, setIndex++, _PyLong_FromGid(p->pw_gid)); |
|
||||
+#ifdef __ANDROID__
|
|
||||
+ SETS(setIndex++, Py_None);
|
|
||||
+ Py_INCREF(Py_None);
|
|
||||
+#else
|
|
||||
SETS(setIndex++, p->pw_gecos); |
|
||||
+#endif
|
|
||||
SETS(setIndex++, p->pw_dir); |
|
||||
SETS(setIndex++, p->pw_shell); |
|
||||
|
|
Loading…
Reference in new issue