LBRYCommunity/kivy-ios
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixes openssl compilation + bumps version

Browse source
This commit is contained in:
Mirko Galimberti 2020-04-11 11:50:24 +02:00
parent 2275362350
commit b47cddddad
2 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
recipes/openssl/__init__.py
View file

@ -5,43 +5,30 @@ import sh
arch_mapper = {'i386': 'darwin-i386-cc', arch_mapper = {'i386': 'darwin-i386-cc',
'x86_64': 'darwin64-x86_64-cc', 'x86_64': 'darwin64-x86_64-cc',
'armv7': 'iphoneos-cross', 'armv7': 'ios-cross',
'arm64': 'iphoneos-cross'} 'arm64': 'ios64-cross'}
class OpensslRecipe(Recipe): class OpensslRecipe(Recipe):
version = "1.0.2k" version = "1.1.1f"
url = "http://www.openssl.org/source/openssl-{version}.tar.gz" url = "http://www.openssl.org/source/openssl-{version}.tar.gz"
libraries = ["libssl.a", "libcrypto.a"] libraries = ["libssl.a", "libcrypto.a"]
include_dir = "include" include_dir = "include"
include_per_arch = True include_per_arch = True
def build_arch(self, arch): def build_arch(self, arch):
options_iphoneos = (
"-isysroot {}".format(arch.sysroot),
"-DOPENSSL_THREADS",
"-D_REENTRANT",
"-DDSO_DLFCN",
"-DHAVE_DLFCN_H",
"-fomit-frame-pointer",
"-fno-common",
"-O3"
)
build_env = arch.get_env() build_env = arch.get_env()
target = arch_mapper[arch.arch] target = arch_mapper[arch.arch]
shprint(sh.env, _env=build_env) shprint(sh.env, _env=build_env)
sh.perl(join(self.build_dir, "Configure"), sh.perl(join(self.build_dir, "Configure"),
target, target,
_env=build_env) _env=build_env)
if target == 'iphoneos-cross': if target.endswith('-cross'):
sh.sed("-ie", "s!^CFLAG=.*!CFLAG={} {}!".format(build_env['CFLAGS'], with open('Makefile', 'r') as makefile:
" ".join(options_iphoneos)), filedata = makefile.read()
"Makefile") filedata = filedata.replace('$(CROSS_TOP)/SDKs/$(CROSS_SDK)', arch.sysroot)
sh.sed("-ie", "s!static volatile sig_atomic_t intr_signal;!static volatile intr_signal;! ", with open('Makefile', 'w') as makefile:
"crypto/ui/ui_openssl.c") makefile.write(filedata)
else:
sh.sed("-ie", "s!^CFLAG=!CFLAG={} !".format(build_env['CFLAGS']),
"Makefile")
shprint(sh.make, "clean") shprint(sh.make, "clean")
shprint(sh.make, self.ctx.concurrent_make, "build_libs") shprint(sh.make, self.ctx.concurrent_make, "build_libs")

1
recipes/python3/__init__.py
View file

@ -139,6 +139,7 @@ class Python3Recipe(Recipe):
sqlite3_src = join(self.recipe_dir, 'mock_modules', '_sqlite3') sqlite3_src = join(self.recipe_dir, 'mock_modules', '_sqlite3')
site_packages_folder = join( site_packages_folder = join(
self.ctx.dist_dir, "root", "python3", "lib", "python3.7", "site-packages", "_sqlite3") self.ctx.dist_dir, "root", "python3", "lib", "python3.7", "site-packages", "_sqlite3")
shutil.rmtree(site_packages_folder, ignore_errors=True) # Needed in case of rebuild
shutil.copytree(sqlite3_src, site_packages_folder) shutil.copytree(sqlite3_src, site_packages_folder)
def reduce_python(self): def reduce_python(self):