Compare commits

..

2 commits

Author SHA1 Message Date
Akinwale Ariwodola
166ae895a0 finish recipes for sdk 2020-09-28 22:29:32 +01:00
Akinwale Ariwodola
4d0020cc0d move recipes around 2020-09-25 00:06:37 +01:00
5 changed files with 52 additions and 58 deletions

View file

@ -1,23 +0,0 @@
# pure-python package, this can be removed when we'll support any python package
import os
import sh
from kivy_ios.toolchain import PythonRecipe, shprint
class CertifiRecipe(PythonRecipe):
version = "2020.6.20"
url = "https://pypi.python.org/packages/source/c/certifi/certifi-{version}.tar.gz"
depends = ["python"]
def install(self):
arch = list(self.filtered_archs)[0]
build_dir = self.get_build_dir(arch.arch)
os.chdir(build_dir)
hostpython = sh.Command(self.ctx.hostpython)
build_env = arch.get_env()
dest_dir = os.path.join(self.ctx.dist_dir, "root", "python3")
build_env['PYTHONPATH'] = os.path.join(dest_dir, 'lib', 'python3.8', 'site-packages')
shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env)
recipe = CertifiRecipe()

View file

@ -12,15 +12,8 @@ class CryptographyRecipe(CythonRecipe):
library = "libcryptography.a"
depends = ["host_setuptools3", "host_cffi", "cffi", "asn1crypto", "idna", "six"]
python_depends = ["setuptools"]
cythonize = False
cythonize = True
pre_build_ext = True
include_per_arch = True
def prebuild_arch(self, arch):
if self.has_marker("patched"):
return
self.apply_patch("osrandom.patch")
self.set_marker("patched")
def dest_dir(self):
return join(self.ctx.dist_dir, "root", "python3")
@ -30,11 +23,10 @@ class CryptographyRecipe(CythonRecipe):
r = self.get_recipe('openssl', self.ctx)
openssl_dir = r.get_build_dir(arch.arch)
target_python = Recipe.get_recipe('python3', self.ctx).get_build_dir(arch.arch)
env['TOOLCHAIN_PREFIX'] = arch.triple
env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl'
env['LDFLAGS'] += ' -L' + target_python
env['PYTHON_ROOT'] = join(self.ctx.dist_dir, "root", "python3")
env["CC"] = "clang -Qunused-arguments -fcolor-diagnostics"
env['CFLAGS'] += ' -I' + env['PYTHON_ROOT'] + '/include/python3.8' + \
' -I' + join(openssl_dir, 'include') + \
' -I' + join(self.ctx.dist_dir, "include", arch.arch, "libffi")
@ -44,8 +36,7 @@ class CryptographyRecipe(CythonRecipe):
' -lssl' + \
' -lcrypto' + \
' -lffi' + \
' -lcffi ' + \
' -lz'
' -lcffi'
return env
def install(self):
@ -58,22 +49,6 @@ class CryptographyRecipe(CythonRecipe):
build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python3.8', 'site-packages')
with cd(build_dir):
shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env)
def postbuild_arch(self, arch):
py_arch = arch.arch
if py_arch == "arm64":
py_arch = "x86_64"
build_dir = self.get_build_dir(arch.arch)
build_env = self.get_recipe_env(arch)
tmp_folder = 'build/temp.macosx-10.15-{}-3.8/build/temp.macosx-10.15-{}-3.8'.format(py_arch, py_arch)
for o_file in [
"_openssl.o",
"_padding.o",
]:
shprint(sh.Command(build_env['AR']),
"-q",
"{}/{}".format(self.build_dir, self.library),
"{}/{}/{}".format(self.build_dir, tmp_folder, o_file))
recipe = CryptographyRecipe()

View file

@ -0,0 +1,45 @@
--- a/src/_cffi_src/openssl/src/osrandom_engine.c 2019-01-22 17:41:49.000000000 +0100
+++ b/src/_cffi_src/openssl/src/osrandom_engine.c 2019-08-12 11:47:03.000000000 +0100
@@ -243,14 +243,10 @@
#if !defined(__APPLE__)
getentropy_works = CRYPTOGRAPHY_OSRANDOM_GETENTROPY_WORKS;
#else
- if (&getentropy != NULL) {
- getentropy_works = CRYPTOGRAPHY_OSRANDOM_GETENTROPY_WORKS;
- } else {
- getentropy_works = CRYPTOGRAPHY_OSRANDOM_GETENTROPY_FALLBACK;
- int fd = dev_urandom_fd();
- if (fd < 0) {
- return 0;
- }
+ getentropy_works = CRYPTOGRAPHY_OSRANDOM_GETENTROPY_FALLBACK;
+ int fd = dev_urandom_fd();
+ if (fd < 0) {
+ return 0;
}
#endif
return 1;
@@ -266,22 +262,7 @@
return dev_urandom_read(buffer, size);
#endif
case CRYPTOGRAPHY_OSRANDOM_GETENTROPY_WORKS:
- while (size > 0) {
- /* OpenBSD and macOS restrict maximum buffer size to 256. */
- len = size > 256 ? 256 : size;
- res = getentropy(buffer, (size_t)len);
- if (res < 0) {
- ERR_Cryptography_OSRandom_error(
- CRYPTOGRAPHY_OSRANDOM_F_RAND_BYTES,
- CRYPTOGRAPHY_OSRANDOM_R_GETENTROPY_FAILED,
- __FILE__, __LINE__
- );
- return 0;
- }
- buffer += len;
- size -= len;
- }
- return 1;
+ return 0;
}
__builtin_unreachable();
}

View file

@ -3,15 +3,13 @@ from os.path import join
import sh, os
class LbryRecipe(PythonRecipe):
version = "v0.82.0"
version = "f7eed62"
url = "https://github.com/lbryio/lbry/archive/{version}.tar.gz"
depends = [
"openssl",
"python",
"ios",
"pyobjus",
"sdl2",
"setuptools",
"kivy",
# install_requires dependencies
"aiohttp",
@ -19,7 +17,6 @@ class LbryRecipe(PythonRecipe):
"appdirs",
"async-timeout",
"base58",
"certifi",
"chardet",
"coincurve",
"colorama",

View file

@ -20,4 +20,4 @@ class SetuptoolsRecipe(PythonRecipe):
shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env)
recipe = SetuptoolsRecipe()
recipe = ChardetRecipe()