@@ -544,7 +544,9 @@ class ArchARMv7_a(ArchARM):
544
544
545
545
def get_env (self ):
546
546
env = super (ArchARMv7_a , self ).get_env ()
547
- env ['CFLAGS' ] = env ['CFLAGS' ] + ' -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -mthumb'
547
+ # env['CFLAGS'] += ' -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16'
548
+ env ['CFLAGS' ] += ' -march=armv7-a -mfloat-abi=softfp -mfpu=neon -mthumb'
549
+ env ['LDFLAGS' ] += ' -march=armv7-a'
548
550
env ['CXXFLAGS' ] = env ['CFLAGS' ]
549
551
return env
550
552
@@ -1535,19 +1537,19 @@ def distribute_libs(self, arch, src_dirs, wildcard='*'):
1535
1537
tgt_dir = join ('libs' , arch .arch )
1536
1538
ensure_dir (tgt_dir )
1537
1539
for src_dir in src_dirs :
1538
- for lib in glob . glob (join (src_dir , wildcard )):
1540
+ for lib in glob (join (src_dir , wildcard )):
1539
1541
shprint (sh .cp , '-a' , lib , tgt_dir )
1540
1542
1541
1543
def distribute_javaclasses (self , javaclass_dir ):
1542
1544
'''Copy existing javaclasses from build dir to current dist dir.'''
1543
1545
info ('Copying java files' )
1544
- for filename in glob . glob (javaclass_dir ):
1546
+ for filename in glob (javaclass_dir ):
1545
1547
shprint (sh .cp , '-a' , filename , 'src' )
1546
1548
1547
1549
def distribute_aars (self , arch ):
1548
1550
'''Process existing .aar bundles and copy to current dist dir.'''
1549
1551
info ('Unpacking aars' )
1550
- for aar in glob . glob (join (self .ctx .aars_dir , '*.aar' )):
1552
+ for aar in glob (join (self .ctx .aars_dir , '*.aar' )):
1551
1553
self ._unpack_aar (aar , arch )
1552
1554
1553
1555
def _unpack_aar (self , aar , arch ):
@@ -1574,7 +1576,7 @@ def _unpack_aar(self, aar, arch):
1574
1576
debug (" from {}" .format (so_src_dir ))
1575
1577
debug (" to {}" .format (so_tgt_dir ))
1576
1578
ensure_dir (so_tgt_dir )
1577
- so_files = glob . glob (join (so_src_dir , '*.so' ))
1579
+ so_files = glob (join (so_src_dir , '*.so' ))
1578
1580
for f in so_files :
1579
1581
shprint (sh .cp , '-a' , f , so_tgt_dir )
1580
1582
@@ -2278,17 +2280,18 @@ def reduce_python_package(self, arch):
2278
2280
class CompiledComponentsPythonRecipe (PythonRecipe ):
2279
2281
pre_build_ext = False
2280
2282
2281
- def install_arch (self , arch ):
2283
+ def build_arch (self , arch ):
2284
+ super (CompiledComponentsPythonRecipe , self ).build_arch (arch )
2282
2285
self .build_compiled_components (arch )
2283
- super (CompiledComponentsPythonRecipe , self ).install_arch (arch )
2284
2286
2285
2287
def build_compiled_components (self , arch ):
2286
2288
info ('Building compiled components in {}' .format (self .name ))
2287
2289
2288
2290
env = self .get_recipe_env (arch )
2289
2291
with current_directory (self .get_build_dir (arch .arch )):
2290
2292
hostpython = sh .Command (self .ctx .hostpython )
2291
- shprint (hostpython , 'setup.py' , 'build_ext' , '-v' )
2293
+ shprint (hostpython , 'setup.py' , 'build_ext' , '-v' ,
2294
+ _env = env )
2292
2295
build_dir = glob ('build/lib.*' )[0 ]
2293
2296
shprint (sh .find , build_dir , '-name' , '"*.o"' , '-exec' ,
2294
2297
env ['STRIP' ], '{}' , ';' , _env = env )
0 commit comments