Skip to content

Commit b2c18e4

Browse files
inclementinclement
committed
Merge pull request kivy#555 from kived/copy-libs
add copy libs option
2 parents 34bebe6 + 7fb74fe commit b2c18e4

File tree

5 files changed

+189
-19
lines changed

5 files changed

+189
-19
lines changed

‎pythonforandroid/build.py‎

Lines changed: 145 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
from __future__ import print_function
2+
13
from os.path import (join, realpath, dirname, expanduser, exists,
2-
split)
3-
from os import environ
4+
split, isdir)
5+
from os import environ, listdir
46
import os
57
import glob
68
import sys
@@ -421,6 +423,7 @@ def __init__(self):
421423
self.toolchain_version = None
422424

423425
self.local_recipes = None
426+
self.copy_libs = False
424427

425428
# root of the toolchain
426429
self.setup_dirs()
@@ -485,6 +488,9 @@ def get_libs_dir(self, arch):
485488
ensure_dir(join(self.libs_dir, arch))
486489
return join(self.libs_dir, arch)
487490

491+
def has_lib(self, arch, lib):
492+
return exists(join(self.get_libs_dir(arch), lib))
493+
488494
def has_package(self, name, arch=None):
489495
try:
490496
recipe = Recipe.get_recipe(name, self)
@@ -622,6 +628,7 @@ def biglink(ctx, arch):
622628
if not len(files):
623629
info('{} recipe has no biglinkable files, skipping'
624630
.format(recipe.name))
631+
continue
625632
info('{} recipe has object files, copying'.format(recipe.name))
626633
files.append(obj_dir)
627634
shprint(sh.cp, '-r', *files)
@@ -636,7 +643,8 @@ def biglink(ctx, arch):
636643
info('Biglinking')
637644
info('target {}'.format(join(ctx.get_libs_dir(arch.arch),
638645
'libpymodules.so')))
639-
biglink_function(
646+
do_biglink = copylibs_function if ctx.copy_libs else biglink_function
647+
do_biglink(
640648
join(ctx.get_libs_dir(arch.arch), 'libpymodules.so'),
641649
obj_dir.split(' '),
642650
extra_link_dirs=[join(ctx.bootstrap.build_dir,
@@ -689,3 +697,137 @@ def biglink_function(soname, objs_paths, extra_link_dirs=[], env=None):
689697
cc = cc.bake(*cc_name.split()[1:])
690698

691699
shprint(cc, '-shared', '-O3', '-o', soname, *unique_args, _env=env)
700+
701+
702+
def copylibs_function(soname, objs_paths, extra_link_dirs=[], env=None):
703+
print('objs_paths are', objs_paths)
704+
705+
re_needso = re.compile(r'^.*\(NEEDED\)\s+Shared library: \[lib(.*)\.so\]\s*$')
706+
blacklist_libs = (
707+
'c',
708+
'stdc++',
709+
'dl',
710+
'python2.7',
711+
'sdl',
712+
'sdl_image',
713+
'sdl_ttf',
714+
'z',
715+
'm',
716+
'GLESv2',
717+
'jpeg',
718+
'png',
719+
'log',
720+
721+
# bootstrap takes care of sdl2 libs (if applicable)
722+
'SDL2',
723+
'SDL2_ttf',
724+
'SDL2_image',
725+
'SDL2_mixer',
726+
)
727+
found_libs = []
728+
sofiles = []
729+
if env and 'READELF' in env:
730+
readelf = env['READELF']
731+
elif 'READELF' in os.environ:
732+
readelf = os.environ['READELF']
733+
else:
734+
readelf = sh.which('readelf').strip()
735+
readelf = sh.Command(readelf).bake('-d')
736+
737+
dest = dirname(soname)
738+
739+
for directory in objs_paths:
740+
for fn in os.listdir(directory):
741+
fn = join(directory, fn)
742+
743+
if not fn.endswith('.libs'):
744+
continue
745+
746+
dirfn = fn[:-1] + 'dirs'
747+
if not exists(dirfn):
748+
continue
749+
750+
with open(fn) as f:
751+
libs = f.read().strip().split(' ')
752+
needed_libs = [lib for lib in libs
753+
if lib and
754+
lib not in blacklist_libs and
755+
lib not in found_libs]
756+
757+
while needed_libs:
758+
print('need libs:\n\t' + '\n\t'.join(needed_libs))
759+
760+
start_needed_libs = needed_libs[:]
761+
found_sofiles = []
762+
763+
with open(dirfn) as f:
764+
libdirs = f.read().split()
765+
for libdir in libdirs:
766+
if not needed_libs:
767+
break
768+
769+
if libdir == dest:
770+
# don't need to copy from dest to dest!
771+
continue
772+
773+
libdir = libdir.strip()
774+
print('scanning', libdir)
775+
for lib in needed_libs[:]:
776+
if lib in found_libs:
777+
continue
778+
779+
if lib.endswith('.a'):
780+
needed_libs.remove(lib)
781+
found_libs.append(lib)
782+
continue
783+
784+
lib_a = 'lib' + lib + '.a'
785+
libpath_a = join(libdir, lib_a)
786+
lib_so = 'lib' + lib + '.so'
787+
libpath_so = join(libdir, lib_so)
788+
plain_so = lib + '.so'
789+
plainpath_so = join(libdir, plain_so)
790+
791+
sopath = None
792+
if exists(libpath_so):
793+
sopath = libpath_so
794+
elif exists(plainpath_so):
795+
sopath = plainpath_so
796+
797+
if sopath:
798+
print('found', lib, 'in', libdir)
799+
found_sofiles.append(sopath)
800+
needed_libs.remove(lib)
801+
found_libs.append(lib)
802+
continue
803+
804+
if exists(libpath_a):
805+
print('found', lib, '(static) in', libdir)
806+
needed_libs.remove(lib)
807+
found_libs.append(lib)
808+
continue
809+
810+
for sofile in found_sofiles:
811+
print('scanning dependencies for', sofile)
812+
out = readelf(sofile)
813+
for line in out.splitlines():
814+
needso = re_needso.match(line)
815+
if needso:
816+
lib = needso.group(1)
817+
if (lib not in needed_libs
818+
and lib not in found_libs
819+
and lib not in blacklist_libs):
820+
needed_libs.append(needso.group(1))
821+
822+
sofiles += found_sofiles
823+
824+
if needed_libs == start_needed_libs:
825+
raise RuntimeError(
826+
'Failed to locate needed libraries!\n\t' +
827+
'\n\t'.join(needed_libs))
828+
829+
print('Copying libraries')
830+
cp = sh.cp.bake('-t', dest)
831+
for lib in sofiles:
832+
shprint(cp, lib)
833+

‎pythonforandroid/recipe.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -974,10 +974,12 @@ def get_recipe_env(self, arch, with_flags_in_cc=True):
974974
if self.ctx.python_recipe.from_crystax:
975975
env['LDSHARED'] = env['CC'] + ' -shared'
976976
else:
977-
env['LDSHARED'] = join(self.ctx.root_dir, 'tools', 'liblink')
977+
env['LDSHARED'] = join(self.ctx.root_dir, 'tools', 'liblink.sh')
978978
# shprint(sh.whereis, env['LDSHARED'], _env=env)
979979
env['LIBLINK'] = 'NOTNONE'
980980
env['NDKPLATFORM'] = self.ctx.ndk_platform
981+
if self.ctx.copy_libs:
982+
env['COPYLIBS'] = '1'
981983

982984
# Every recipe uses its own liblink path, object files are
983985
# collected and biglinked later

‎pythonforandroid/toolchain.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,11 @@ def __init__(self):
268268
dest='local_recipes', default='./p4a-recipes',
269269
help='Directory to look for local recipes')
270270

271+
add_boolean_option(
272+
parser, ['copy-libs'],
273+
default=False,
274+
description='Copy libraries instead of using biglink (Android 4.3+)')
275+
271276
self._read_configuration()
272277

273278
args, unknown = parser.parse_known_args(sys.argv[1:])
@@ -302,6 +307,7 @@ def __init__(self):
302307
exit(1)
303308

304309
self.ctx.local_recipes = args.local_recipes
310+
self.ctx.copy_libs = args.copy_libs
305311

306312
getattr(self, args.command)(unknown)
307313

‎pythonforandroid/tools/liblink‎

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ libs = [ ]
1010
objects = [ ]
1111
output = None
1212

13+
copylibs = environ.get('COPYLIBS', '0') == '1'
1314

1415
i = 1
1516
while i < len(sys.argv):
@@ -62,19 +63,35 @@ while i < len(sys.argv):
6263
objects.append(opt)
6364

6465

65-
f = open(output, "w")
66-
f.close()
67-
6866
print('liblink path is', str(environ.get('LIBLINK_PATH')))
69-
output = join(environ.get('LIBLINK_PATH'), basename(output))
70-
71-
f = open(output + ".libs", "w")
72-
f.write(" ".join(libs))
73-
f.close()
74-
75-
sys.exit(subprocess.call([
76-
environ.get('LD'), '-r',
77-
'-o', output + '.o'
78-
#, '-arch', environ.get('ARCH')
79-
] + objects))
80-
67+
abs_output = join(environ.get('LIBLINK_PATH'), basename(output))
68+
69+
if not copylibs:
70+
f = open(output, "w")
71+
f.close()
72+
73+
output = abs_output
74+
75+
f = open(output + ".libs", "w")
76+
f.write(" ".join(libs))
77+
f.close()
78+
79+
sys.exit(subprocess.call([
80+
environ.get('LD'), '-r',
81+
'-o', output + '.o'
82+
#, '-arch', environ.get('ARCH')
83+
] + objects))
84+
else:
85+
with open(abs_output + '.libs', 'w') as f_libs:
86+
with open(abs_output + '.libdirs', 'w') as f_libdirs:
87+
for l in libs:
88+
if l[1] == 'l':
89+
f_libs.write(l[2:])
90+
f_libs.write(' ')
91+
else:
92+
f_libdirs.write(l[2:])
93+
f_libdirs.write(' ')
94+
95+
libargs = ' '.join(["'%s'" % arg for arg in sys.argv[1:]])
96+
cmd = '%s -shared %s %s' % (environ['CC'], environ['LDFLAGS'], libargs)
97+
sys.exit(subprocess.call(cmd, shell=True))

‎pythonforandroid/tools/liblink.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
3+
PYTHONPATH= python `dirname $0`/liblink "$@"

0 commit comments

Comments
 (0)