ignatenkobrain pushed to angelscript (master). "arm build fixes (..more)"

[notifications at fedoraproject.org]

From 856208e7a3ed08c762b0e9631213ce08d7ae53fb Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Thu, 21 May 2015 11:05:38 +0300
Subject: arm build fixes

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

diff --git a/angelscript-meson.build b/angelscript-meson.build
index 274542d..c7506ec 100644
--- a/angelscript-meson.build
+++ b/angelscript-meson.build
@@ -42,12 +42,16 @@ srcs = [
 ]
 
 if arch.stdout().strip() == 'armv7l'
-  srcs = srcs + ['source/as_callfunc_arm.cpp', 'source/as_callfunc_arm_gcc.s']
+  srcs = srcs + ['source/as_callfunc_arm.cpp']
+  obj = shared_library('as_callfunc_arm_gcc', 'source/as_callfunc_arm_gcc.s').extract('as_callfunc_arm_gcc.s')
+else
+  obj = []
 endif
 
 shared_library(
   'angelscript',
   sources : srcs,
+  objects : obj,
   install : true,
   soversion : '0',
   version : '2.30.0',
diff --git a/angelscript.spec b/angelscript.spec
index 73b5420..e1933f9 100644
--- a/angelscript.spec
+++ b/angelscript.spec
@@ -1,6 +1,6 @@
 Name:           angelscript
 Version:        2.30.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Flexible cross-platform scripting library
 
 License:        zlib
@@ -58,6 +58,9 @@ chrpath -d %{buildroot}%{_libdir}/*
 %{_includedir}/%{name}.h
 
 %changelog
+* Thu May 21 2015 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 2.30.0-5
+- arm build fixes
+
 * Wed May 20 2015 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 2.30.0-4
 - Fix arm building
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/angelscript.git/commit/?h=master&id=856208e7a3ed08c762b0e9631213ce08d7ae53fb