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

Merge pull request #338 from learnleapfly/deprecate_armv7

Browse source 
Deprecate armv7
This commit is contained in:
Mathieu Virbel 2019-01-14 19:41:24 +01:00 • committed by GitHub
commit 49c607a80d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
recipes/libffi/__init__.py
View file

@ -11,7 +11,7 @@ class LibffiRecipe(Recipe):
include_per_arch = True include_per_arch = True
include_dir = "build_{arch.sdk}-{arch.arch}/include" include_dir = "build_{arch.sdk}-{arch.arch}/include"
include_name = "ffi" include_name = "ffi"
archs = ["x86_64", "armv7", "arm64"] archs = ["x86_64", "arm64"]
def prebuild_arch(self, arch): def prebuild_arch(self, arch):
if self.has_marker("patched"): if self.has_marker("patched"):

23
toolchain.py
View file

@ -223,36 +223,19 @@ class Arch(object):
return env return env
class ArchSimulator(Arch):
sdk = "iphonesimulator"
arch = "i386"
triple = "i386-apple-darwin11"
version_min = "-miphoneos-version-min=6.0.0"
sysroot = sh.xcrun("--sdk", "iphonesimulator", "--show-sdk-path").strip()
class Arch64Simulator(Arch): class Arch64Simulator(Arch):
sdk = "iphonesimulator" sdk = "iphonesimulator"
arch = "x86_64" arch = "x86_64"
triple = "x86_64-apple-darwin13" triple = "x86_64-apple-darwin13"
version_min = "-miphoneos-version-min=7.0" version_min = "-miphoneos-version-min=8.0"
sysroot = sh.xcrun("--sdk", "iphonesimulator", "--show-sdk-path").strip() sysroot = sh.xcrun("--sdk", "iphonesimulator", "--show-sdk-path").strip()
class ArchIOS(Arch):
sdk = "iphoneos"
arch = "armv7"
triple = "arm-apple-darwin11"
version_min = "-miphoneos-version-min=6.0.0"
sysroot = sh.xcrun("--sdk", "iphoneos", "--show-sdk-path").strip()
class Arch64IOS(Arch): class Arch64IOS(Arch):
sdk = "iphoneos" sdk = "iphoneos"
arch = "arm64" arch = "arm64"
triple = "aarch64-apple-darwin13" triple = "aarch64-apple-darwin13"
version_min = "-miphoneos-version-min=7.0" version_min = "-miphoneos-version-min=8.0"
sysroot = sh.xcrun("--sdk", "iphoneos", "--show-sdk-path").strip() sysroot = sh.xcrun("--sdk", "iphoneos", "--show-sdk-path").strip()
@ -355,9 +338,7 @@ class Context(object):
self.install_dir = "{}/dist/root".format(self.root_dir) self.install_dir = "{}/dist/root".format(self.root_dir)
self.include_dir = "{}/dist/include".format(self.root_dir) self.include_dir = "{}/dist/include".format(self.root_dir)
self.archs = ( self.archs = (
# ArchSimulator(self),
Arch64Simulator(self), Arch64Simulator(self),
ArchIOS(self),
Arch64IOS(self)) Arch64IOS(self))
# path to some tools # path to some tools

2
tools/biglink
View file

@ -20,5 +20,5 @@ for fn in sofiles:
unique_args = ' '.join(x for x in sorted(set(args)) if x.endswith('.so.o')) unique_args = ' '.join(x for x in sorted(set(args)) if x.endswith('.so.o'))
print('Biglink create %s library' % sys.argv[1]) print('Biglink create %s library' % sys.argv[1])
cmd = "ar -q %s %s" % (sys.argv[1], unique_args) cmd = "ar -q %s %s" % (sys.argv[1], unique_args)
print(cmd) print('Binlinking: {}'.format(cmd))
subprocess.Popen(cmd, shell=True).communicate() subprocess.Popen(cmd, shell=True).communicate()

10
tools/liblink
View file

@ -75,5 +75,11 @@ f.close()
print('Liblink redirect linking with', objects) print('Liblink redirect linking with', objects)
ld = environ.get('ARM_LD') ld = environ.get('ARM_LD')
arch = environ.get('ARCH', 'armv7') arch = environ.get('ARCH', 'arm64')
subprocess.call([ld, '-r', '-o', output + '.o', '-ios_version_min', '7.0', '-arch', arch] + objects) if 'arm' in arch:
min_version_flag = '-ios_version_min'
else:
min_version_flag = '-ios_simulator_version_min'
call = [ld, '-r', '-o', output + '.o', min_version_flag, '8.0', '-arch', arch] + objects
print("Linking: {}".format(" ".join(call)))
subprocess.call(call)