diff options
| -rw-r--r-- | tools/depends/target/python27/Makefile | 2 | ||||
| -rw-r--r-- | tools/depends/target/python27/python-android-binmodule.patch | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/tools/depends/target/python27/Makefile b/tools/depends/target/python27/Makefile index 1b7f29d47a..f891522d85 100644 --- a/tools/depends/target/python27/Makefile +++ b/tools/depends/target/python27/Makefile @@ -39,7 +39,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) cd $(PLATFORM); patch -p0 < ../Python-2.7.10-android.patch cd $(PLATFORM); patch -p0 < ../Python-no-export-path.patch cd $(PLATFORM); patch -p0 < ../fix-ffi.patch - cd $(PLATFORM); patch -l -p0 < ../python-android-binmodule.patch + cd $(PLATFORM); patch -p0 < ../python-android-binmodule.patch cd $(PLATFORM); patch -p1 < ../Python-no-abort.patch cd $(PLATFORM); patch -p1 < ../python-android-nl_langinfo.patch ifeq ($(OS),ios) diff --git a/tools/depends/target/python27/python-android-binmodule.patch b/tools/depends/target/python27/python-android-binmodule.patch index c28ddf6719..a5132cd47b 100644 --- a/tools/depends/target/python27/python-android-binmodule.patch +++ b/tools/depends/target/python27/python-android-binmodule.patch @@ -1,31 +1,31 @@ --- Python/dynload_shlib.c 2014-08-13 15:13:49.879675283 +0200 +++ Python/dynload_shlib.c 2014-08-13 19:03:57.456363680 +0200 @@ -112,10 +112,6 @@ - dlopenflags = PyThreadState_GET()->interp->dlopenflags; + dlopenflags = PyThreadState_GET()->interp->dlopenflags; #endif -- if (Py_VerboseFlag) -- PySys_WriteStderr("dlopen(\"%s\", %x);\n", pathname, -- dlopenflags); +- if (Py_VerboseFlag) +- PySys_WriteStderr("dlopen(\"%s\", %x);\n", pathname, +- dlopenflags); - #ifdef __VMS - /* VMS currently don't allow a pathname, use a logical name instead */ - /* Concatenate 'python_module_' and shortname */ + /* VMS currently don't allow a pathname, use a logical name instead */ + /* Concatenate 'python_module_' and shortname */ @@ -125,8 +121,17 @@ - PyOS_snprintf(pathbuf, sizeof(pathbuf), "python_module_%-.200s", - shortname); - pathname = pathbuf; + PyOS_snprintf(pathbuf, sizeof(pathbuf), "python_module_%-.200s", + shortname); + pathname = pathbuf; +#elif defined(ANDROID) -+ /* Android does not allow a pathname and wants lib*.so */ -+ PyOS_snprintf(pathbuf, sizeof(pathbuf), "lib%-.200s.so", -+ shortname); -+ pathname = pathbuf; ++ /* Android does not allow a pathname and wants lib*.so */ ++ PyOS_snprintf(pathbuf, sizeof(pathbuf), "lib%-.200s.so", ++ shortname); ++ pathname = pathbuf; #endif -+ if (Py_VerboseFlag) -+ PySys_WriteStderr("dlopen(\"%s\", %x);\n", pathname, -+ dlopenflags); ++ if (Py_VerboseFlag) ++ PySys_WriteStderr("dlopen(\"%s\", %x);\n", pathname, ++ dlopenflags); + - handle = dlopen(pathname, dlopenflags); + handle = dlopen(pathname, dlopenflags); - if (handle == NULL) { + if (handle == NULL) { |