Merge pull request #1 from learnleapfly/merge-upstream
Merge upstream - 20180129
This commit is contained in:
commit
9ab06cf477
4 changed files with 43 additions and 0 deletions
24
README.rst
24
README.rst
|
@ -173,6 +173,30 @@ things you can do to achieve this:
|
|||
Note that these packages will not run in the iOS emulators, so use them
|
||||
only for deployment.
|
||||
|
||||
Usage
|
||||
-----
|
||||
|
||||
::
|
||||
|
||||
Usage:
|
||||
|
||||
./toolchain.py <command> [<args>]
|
||||
|
||||
Available commands:
|
||||
build Build a recipe (compile a library for the required target
|
||||
architecture)
|
||||
clean Clean the build of the specified recipe
|
||||
distclean Clean the build and the result
|
||||
recipes List all the available recipes
|
||||
status List all the recipes and their build status
|
||||
|
||||
Xcode:
|
||||
create Create a new xcode project
|
||||
update Update an existing xcode project (frameworks, libraries..)
|
||||
launchimage Create Launch images for your xcode project
|
||||
icon Create Icons for your xcode project
|
||||
pip Install a pip dependency into the distribution
|
||||
|
||||
FAQ
|
||||
---
|
||||
|
||||
|
|
|
@ -60,6 +60,8 @@ class HostpythonRecipe(Recipe):
|
|||
])
|
||||
build_env["CFLAGS"] = " ".join([
|
||||
"--sysroot={}".format(sdk_path),
|
||||
"-arch x86_64",
|
||||
"-mmacosx-version-min=10.12",
|
||||
"-I{}".format(join(self.ctx.dist_dir, "hostlibffi", "usr", "local", "include"))
|
||||
])
|
||||
|
||||
|
|
|
@ -35,6 +35,7 @@ class PythonRecipe(Recipe):
|
|||
self.apply_patch("ipv6.patch")
|
||||
if "openssl.build_all" in self.ctx.state:
|
||||
self.append_file("ModulesSetup.openssl", "Modules/Setup.local")
|
||||
self.apply_patch("posixmodule.patch")
|
||||
|
||||
self.set_marker("patched")
|
||||
|
||||
|
|
16
recipes/python/posixmodule.patch
Normal file
16
recipes/python/posixmodule.patch
Normal file
|
@ -0,0 +1,16 @@
|
|||
Index: Python-2.7.1/Modules/posixmodule.c
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
--- Python-2.7.1/Modules/posixmodule.c (date 1290868829000)
|
||||
+++ Python-2.7.1/Modules/posixmodule.c (revision )
|
||||
@@ -2644,7 +2644,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-
|
||||
+#undef HAVE_SYSTEM
|
||||
#ifdef HAVE_SYSTEM
|
||||
PyDoc_STRVAR(posix_system__doc__,
|
||||
"system(command) -> exit_status\n\n\
|
Loading…
Reference in a new issue