more arm fixes

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

angelscript-meson.build

@@ -1,59 +1,5 @@
 project('angelscript', 'cpp', 'c')
 
-arch = run_command('uname', '-p')
-
-srcs = [
-  'source/as_atomic.cpp',
-  'source/as_builder.cpp',
-  'source/as_bytecode.cpp',
-  'source/as_callfunc.cpp',
-  'source/as_callfunc_arm.cpp',
-  'source/as_callfunc_mips.cpp',
-  'source/as_callfunc_ppc.cpp',
-  'source/as_callfunc_ppc_64.cpp',
-  'source/as_callfunc_sh4.cpp',
-  'source/as_callfunc_x86.cpp',
-  'source/as_callfunc_x64_gcc.cpp',
-  'source/as_callfunc_x64_mingw.cpp',
-  'source/as_compiler.cpp',
-  'source/as_context.cpp',
-  'source/as_configgroup.cpp',
-  'source/as_datatype.cpp',
-  'source/as_generic.cpp',
-  'source/as_gc.cpp',
-  'source/as_globalproperty.cpp',
-  'source/as_memory.cpp',
-  'source/as_module.cpp',
-  'source/as_objecttype.cpp',
-  'source/as_outputbuffer.cpp',
-  'source/as_parser.cpp',
-  'source/as_restore.cpp',
-  'source/as_scriptcode.cpp',
-  'source/as_scriptengine.cpp',
-  'source/as_scriptfunction.cpp',
-  'source/as_scriptnode.cpp',
-  'source/as_scriptobject.cpp',
-  'source/as_string.cpp',
-  'source/as_string_util.cpp',
-  'source/as_thread.cpp',
-  'source/as_tokenizer.cpp',
-  'source/as_typeinfo.cpp',
-  'source/as_variablescope.cpp',
-]
-
-if arch.stdout().strip() == 'armv7l'
-  srcs = srcs + ['source/as_callfunc_arm.cpp']
-  obj = shared_library('as_callfunc_arm_gcc', 'source/as_callfunc_arm_gcc.s').extract_objects('source/as_callfunc_arm_gcc.s')
-else
-  obj = []
-endif
-
-shared_library(
-  'angelscript',
-  sources : srcs,
-  objects : obj,
-  install : true,
-  soversion : '0',
-  version : '2.30.0',
-)
+arch = run_command('uname', '-p').stdout().strip()
+subdir('source')
 install_headers('include/angelscript.h')

angelscript-source-meson.build

@@ -0,0 +1,54 @@
+srcs = [
+  'as_atomic.cpp',
+  'as_builder.cpp',
+  'as_bytecode.cpp',
+  'as_callfunc.cpp',
+  'as_callfunc_arm.cpp',
+  'as_callfunc_mips.cpp',
+  'as_callfunc_ppc.cpp',
+  'as_callfunc_ppc_64.cpp',
+  'as_callfunc_sh4.cpp',
+  'as_callfunc_x86.cpp',
+  'as_callfunc_x64_gcc.cpp',
+  'as_callfunc_x64_mingw.cpp',
+  'as_compiler.cpp',
+  'as_context.cpp',
+  'as_configgroup.cpp',
+  'as_datatype.cpp',
+  'as_generic.cpp',
+  'as_gc.cpp',
+  'as_globalproperty.cpp',
+  'as_memory.cpp',
+  'as_module.cpp',
+  'as_objecttype.cpp',
+  'as_outputbuffer.cpp',
+  'as_parser.cpp',
+  'as_restore.cpp',
+  'as_scriptcode.cpp',
+  'as_scriptengine.cpp',
+  'as_scriptfunction.cpp',
+  'as_scriptnode.cpp',
+  'as_scriptobject.cpp',
+  'as_string.cpp',
+  'as_string_util.cpp',
+  'as_thread.cpp',
+  'as_tokenizer.cpp',
+  'as_typeinfo.cpp',
+  'as_variablescope.cpp',
+]
+
+if arch == 'armv7l'
+  srcs = srcs + ['as_callfunc_arm.cpp']
+  obj = shared_library('as_callfunc_arm_gcc', 'as_callfunc_arm_gcc.s').extract_objects('as_callfunc_arm_gcc.s')
+else
+  obj = []
+endif
+
+shared_library(
+  'angelscript',
+  sources : srcs,
+  objects : obj,
+  install : true,
+  soversion : '0',
+  version : '2.30.0',
+)

angelscript.spec

@@ -7,6 +7,7 @@ License:        zlib
 URL:            http://www.angelcode.com/angelscript/
 Source0:        http://www.angelcode.com/angelscript/sdk/files/%{name}_%{version}.zip
 Source1:        angelscript-meson.build
+Source2:        angelscript-source-meson.build
 
 BuildRequires:  meson chrpath
 
@@ -30,6 +31,7 @@ developing applications that use %{name}.
 %setup -q -c
 rm -rf build && mkdir build
 cp %{SOURCE1} sdk/%{name}/meson.build
+cp %{SOURCE2} sdk/%{name}/source/meson.build
 mv -f sdk/%{name}/source/as_callfunc_arm_gcc.S sdk/%{name}/source/as_callfunc_arm_gcc.s
 
 %build