From afb4207cdff85b34232e6f9f8848d4cec68ce9b3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Nov 25 2016 09:15:20 +0000 Subject: Build on all architectures Signed-off-by: Igor Gnatenko --- diff --git a/0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch b/0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch new file mode 100644 index 0000000..76c97ab --- /dev/null +++ b/0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch @@ -0,0 +1,91 @@ +From 5c3df25a087d2808a4dc7558663b02b318d7e064 Mon Sep 17 00:00:00 2001 +From: angelcode +Date: Thu, 29 Sep 2016 22:38:58 +0000 +Subject: [PATCH 1/3] Fixed compiler error on Linux with non-x86 64bit + platforms, e.g. arm64, mips, and s390x architectures + +git-svn-id: http://svn.code.sf.net/p/angelscript/code/trunk@2353 404ce1b2-830e-0410-a2e2-b09542c77caf +(cherry picked from commit 0fc7f2dbe7cdc455e9c2e5a7a372817b815a6eb4) +--- + sdk/angelscript/projects/cmake/CMakeLists.txt | 7 +++++-- + sdk/angelscript/source/as_config.h | 7 ++++++- + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/sdk/angelscript/projects/cmake/CMakeLists.txt b/sdk/angelscript/projects/cmake/CMakeLists.txt +index 3af7f6f..9ad2440 100644 +--- a/sdk/angelscript/projects/cmake/CMakeLists.txt ++++ b/sdk/angelscript/projects/cmake/CMakeLists.txt +@@ -63,6 +63,7 @@ set(ANGELSCRIPT_SOURCE + ../../source/as_builder.cpp + ../../source/as_bytecode.cpp + ../../source/as_callfunc.cpp ++ ../../source/as_callfunc_mips.cpp + ../../source/as_callfunc_x86.cpp + ../../source/as_callfunc_x64_gcc.cpp + ../../source/as_callfunc_x64_msvc.cpp +@@ -135,7 +136,8 @@ endif() + set(ANGELSCRIPT_LIBRARY_NAME ${ANGELSCRIPT_LIBRARY_NAME} CACHE STRING "" FORCE) + + add_library(${ANGELSCRIPT_LIBRARY_NAME} ${ANGELSCRIPT_SOURCE} ${ANGELSCRIPT_HEADERS}) +-set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib) ++# Don't override the default library output path to avoid conflicts when building for multiple target platforms ++#set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib) + target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} ${CMAKE_THREAD_LIBS_INIT}) + + set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION}) +@@ -156,6 +158,7 @@ if(MSVC) + set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES COMPILE_FLAGS "/MP") + endif() + +-set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../bin) ++# Don't override the default runtime output path to avoid conflicts when building for multiple target platforms ++#set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../bin) + + +diff --git a/sdk/angelscript/source/as_config.h b/sdk/angelscript/source/as_config.h +index 9edaf0f..fce2f25 100644 +--- a/sdk/angelscript/source/as_config.h ++++ b/sdk/angelscript/source/as_config.h +@@ -841,6 +841,7 @@ + #define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY) + + #if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__) ++ // x86 32bit + #define THISCALL_RETURN_SIMPLE_IN_MEMORY + #define CDECL_RETURN_SIMPLE_IN_MEMORY + #define STDCALL_RETURN_SIMPLE_IN_MEMORY +@@ -849,7 +850,8 @@ + #define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK + #define AS_X86 + #undef AS_NO_THISCALL_FUNCTOR_METHOD +- #elif defined(__LP64__) && !defined(__arm64__) && !defined(__PPC64__) ++ #elif defined(__x86_64__) ++ // x86 64bit + #define AS_X64_GCC + #undef AS_NO_THISCALL_FUNCTOR_METHOD + #define HAS_128_BIT_PRIMITIVES +@@ -860,6 +862,7 @@ + #undef STDCALL + #define STDCALL + #elif (defined(__ARMEL__) || defined(__arm__)) && !(defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)) ++ // arm 32bit + #define AS_ARM + + // TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S +@@ -897,11 +900,13 @@ + #undef AS_NO_THISCALL_FUNCTOR_METHOD + + #elif defined(__mips__) ++ // mips + #define AS_MIPS + #undef STDCALL + #define STDCALL + + #ifdef _ABIO32 ++ // 32bit O32 ABI + #define AS_MIPS + + // All structures are returned in memory regardless of size or complexity +-- +2.10.2 + diff --git a/0002-Changes-to-meson-project-files.patch b/0002-Changes-to-meson-project-files.patch new file mode 100644 index 0000000..1798242 --- /dev/null +++ b/0002-Changes-to-meson-project-files.patch @@ -0,0 +1,113 @@ +From b3a1fa7b884ea8f1ba63a55237c8c773050a185e Mon Sep 17 00:00:00 2001 +From: angelcode +Date: Mon, 21 Nov 2016 23:28:50 +0000 +Subject: [PATCH 2/3] Changes to meson project files + +git-svn-id: http://svn.code.sf.net/p/angelscript/code/trunk@2361 404ce1b2-830e-0410-a2e2-b09542c77caf +(cherry picked from commit 602584f835ef007463bb7d798cf4baeee4d37f2b) +--- + sdk/angelscript/projects/meson/detect_ver.py | 31 ++++++++++++++++++++++---- + sdk/angelscript/projects/meson/meson.build | 33 ++++++++++++++++++---------- + 2 files changed, 48 insertions(+), 16 deletions(-) + +diff --git a/sdk/angelscript/projects/meson/detect_ver.py b/sdk/angelscript/projects/meson/detect_ver.py +index d7ae8a5..2e05ddf 100644 +--- a/sdk/angelscript/projects/meson/detect_ver.py ++++ b/sdk/angelscript/projects/meson/detect_ver.py +@@ -1,5 +1,28 @@ ++import argparse ++import os + import re +-with open('../../include/angelscript.h') as f: +- for l in f.readlines(): +- if l.startswith('#define ANGELSCRIPT_VERSION_STRING'): +- print(re.search('[\d]+\.[\d]+\.[\d]+', l).group(0)) ++ ++HEADER = os.path.join(os.path.dirname(os.path.abspath(__file__)), ++ "..", "..", "include", "angelscript.h") ++ ++def main(): ++ parser = argparse.ArgumentParser() ++ parser.add_argument("--num", action="store_true", help="Print numeric version") ++ args = parser.parse_args() ++ ++ if args.num: ++ regex = re.compile(r'^#define ANGELSCRIPT_VERSION\s+(\d+)') ++ else: ++ regex = re.compile(r'^#define ANGELSCRIPT_VERSION_STRING\s+"(\d+\.\d+\.\d+.*)"') ++ ++ with open(HEADER, "r") as fobj: ++ for l in fobj: ++ match = re.match(regex, l) ++ if match is not None: ++ print(match.group(1)) ++ return ++ ++ assert False, "Can't find version" ++ ++if __name__ == "__main__": ++ main() +\ No newline at end of file +diff --git a/sdk/angelscript/projects/meson/meson.build b/sdk/angelscript/projects/meson/meson.build +index 891e8c2..9dea003 100644 +--- a/sdk/angelscript/projects/meson/meson.build ++++ b/sdk/angelscript/projects/meson/meson.build +@@ -1,14 +1,15 @@ +-project('angelscript', 'cpp', 'c') ++project('angelscript', 'cpp', ++ version : run_command(find_program('python3'), 'detect_ver.py').stdout().strip(), ++ meson_version : '>=0.28.0', ++ license : 'zlib') + +-arch = run_command('uname', '-p').stdout().strip() +-version = run_command(find_program('python3'), 'detect_ver.py').stdout().strip() ++threads = dependency('threads') + +-srcs = [ ++angel_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', +@@ -41,19 +42,27 @@ srcs = [ + '../../source/as_typeinfo.cpp', + '../../source/as_variablescope.cpp', + ] +-if arch == 'armv7l' +- srcs = srcs + [ ++if host_machine.cpu_family() == 'arm' ++ add_languages('c') ++ angel_srcs += [ + '../../source/as_callfunc_arm.cpp', +- '../../source/as_callfunc_arm_gcc.S' ++ '../../source/as_callfunc_arm_gcc.S', + ] + endif + +-shared_library( ++angelscript_version_num = run_command(find_program('python3'), 'detect_ver.py', '--num').stdout().strip() ++angelscript_lib = library( + 'angelscript', +- sources : srcs, ++ sources : angel_srcs, ++ dependencies : threads, ++ version : angelscript_version_num, + install : true, +- soversion : '0', +- version : version, ++) ++angelscript_inc = include_directories('../../include') ++angelscript_dep = declare_dependency( ++ link_with : angelscript_lib, ++ include_directories : angelscript_inc, ++ version : meson.project_version(), + ) + + install_headers('../../include/angelscript.h') +-- +2.10.2 + diff --git a/0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch b/0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch new file mode 100644 index 0000000..acc24f8 --- /dev/null +++ b/0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch @@ -0,0 +1,118 @@ +From ba6c8a4380a54de2e3ef246d8207d2f7dfb71c1a Mon Sep 17 00:00:00 2001 +From: angelcode +Date: Thu, 24 Nov 2016 15:10:09 +0000 +Subject: [PATCH 3/3] Corrected as_config.h so Linux for 64bit ARM doesn't try + to compile as_callfunc_x64_gcc.cpp + +git-svn-id: http://svn.code.sf.net/p/angelscript/code/trunk@2364 404ce1b2-830e-0410-a2e2-b09542c77caf +(cherry picked from commit 58087fcf4b0a9cc950a48e4444654f2930ac997a) +--- + sdk/angelscript/source/as_config.h | 77 +++++++++++++++++++------------------- + 1 file changed, 39 insertions(+), 38 deletions(-) + +diff --git a/sdk/angelscript/source/as_config.h b/sdk/angelscript/source/as_config.h +index fce2f25..8542c18 100644 +--- a/sdk/angelscript/source/as_config.h ++++ b/sdk/angelscript/source/as_config.h +@@ -861,43 +861,47 @@ + // STDCALL is not available on 64bit Linux + #undef STDCALL + #define STDCALL +- #elif (defined(__ARMEL__) || defined(__arm__)) && !(defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)) +- // arm 32bit +- #define AS_ARM ++ #elif defined(__ARMEL__) || defined(__arm__) || defined(__aarch64__) || defined(__AARCH64EL__) ++ // arm + +- // TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S +- #define AS_NO_EXCEPTIONS ++ // The assembler code currently doesn't support arm v4, nor 64bit (v8) ++ #if !defined(__ARM_ARCH_4__) && !defined(__ARM_ARCH_4T__) && !defined(__LP64__) ++ #define AS_ARM + +- #undef STDCALL +- #define STDCALL ++ // TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S ++ #define AS_NO_EXCEPTIONS + +- #define CDECL_RETURN_SIMPLE_IN_MEMORY +- #define STDCALL_RETURN_SIMPLE_IN_MEMORY +- #define THISCALL_RETURN_SIMPLE_IN_MEMORY ++ #undef STDCALL ++ #define STDCALL + +- #undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE +- #undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE +- #undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE ++ #define CDECL_RETURN_SIMPLE_IN_MEMORY ++ #define STDCALL_RETURN_SIMPLE_IN_MEMORY ++ #define THISCALL_RETURN_SIMPLE_IN_MEMORY + +- #define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 +- #define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 +- #define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 ++ #undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE ++ #undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE ++ #undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE + +- #ifndef AS_MAX_PORTABILITY +- // Make a few checks against incompatible ABI combinations +- #if defined(__FAST_MATH__) && __FAST_MATH__ == 1 +- #error -ffast-math is not supported with native calling conventions +- #endif +- #endif ++ #define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 ++ #define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 ++ #define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2 + +- // Verify if soft-float or hard-float ABI is used +- #if defined(__SOFTFP__) && __SOFTFP__ == 1 +- // -ffloat-abi=softfp or -ffloat-abi=soft +- #define AS_SOFTFP +- #endif ++ #ifndef AS_MAX_PORTABILITY ++ // Make a few checks against incompatible ABI combinations ++ #if defined(__FAST_MATH__) && __FAST_MATH__ == 1 ++ #error -ffast-math is not supported with native calling conventions ++ #endif ++ #endif + +- // Tested with both hard float and soft float abi +- #undef AS_NO_THISCALL_FUNCTOR_METHOD ++ // Verify if soft-float or hard-float ABI is used ++ #if defined(__SOFTFP__) && __SOFTFP__ == 1 ++ // -ffloat-abi=softfp or -ffloat-abi=soft ++ #define AS_SOFTFP ++ #endif ++ ++ // Tested with both hard float and soft float abi ++ #undef AS_NO_THISCALL_FUNCTOR_METHOD ++ #endif + + #elif defined(__mips__) + // mips +@@ -922,15 +926,12 @@ + #define AS_MAX_PORTABILITY + #endif + #elif defined(__PPC64__) +- // Support native calling conventions on Linux with PPC64 +- // TODO: This has not yet been confirmed to work +- #define AS_PPC_64 +- #define SPLIT_OBJS_BY_MEMBER_TYPES +- #define THISCALL_RETURN_SIMPLE_IN_MEMORY +- #define CDECL_RETURN_SIMPLE_IN_MEMORY +- #define STDCALL_RETURN_SIMPLE_IN_MEMORY +- #undef STDCALL +- #define STDCALL ++ // PPC 64bit ++ ++ // The code in as_callfunc_ppc_64.cpp was built for PS3 and XBox 360, that ++ // although use 64bit PPC only uses 32bit pointers. ++ // TODO: Add support for native calling conventions on Linux with PPC 64bit ++ #define AS_MAX_PORTABILITY + #else + #define AS_MAX_PORTABILITY + #endif +-- +2.10.2 + diff --git a/angelscript-2.31.1-meson.diff b/angelscript-2.31.1-meson.diff deleted file mode 100644 index 7a0e304..0000000 --- a/angelscript-2.31.1-meson.diff +++ /dev/null @@ -1,168 +0,0 @@ -diff -uNr angelscript-2.31.1.orig/sdk/angelscript/projects/meson/detect_ver.py angelscript-2.31.1/sdk/angelscript/projects/meson/detect_ver.py ---- angelscript-2.31.1.orig/sdk/angelscript/projects/meson/detect_ver.py 2015-05-21 23:01:38.000000000 +0200 -+++ angelscript-2.31.1/sdk/angelscript/projects/meson/detect_ver.py 2016-11-20 14:26:13.894259849 +0100 -@@ -1,5 +1,28 @@ --import re --with open('../../include/angelscript.h') as f: -- for l in f.readlines(): -- if l.startswith('#define ANGELSCRIPT_VERSION_STRING'): -- print(re.search('[\d]+\.[\d]+\.[\d]+', l).group(0)) -+import argparse -+import os -+import re -+ -+HEADER = os.path.join(os.path.dirname(os.path.abspath(__file__)), -+ "..", "..", "include", "angelscript.h") -+ -+def main(): -+ parser = argparse.ArgumentParser() -+ parser.add_argument("--num", action="store_true", help="Print numeric version") -+ args = parser.parse_args() -+ -+ if args.num: -+ regex = re.compile(r'^#define ANGELSCRIPT_VERSION\s+(\d+)') -+ else: -+ regex = re.compile(r'^#define ANGELSCRIPT_VERSION_STRING\s+"(\d+\.\d+\.\d+.*)"') -+ -+ with open(HEADER, "r") as fobj: -+ for l in fobj: -+ match = re.match(regex, l) -+ if match is not None: -+ print(match.group(1)) -+ return -+ -+ assert False, "Can't find version" -+ -+if __name__ == "__main__": -+ main() -diff -uNr angelscript-2.31.1.orig/sdk/angelscript/projects/meson/meson.build angelscript-2.31.1/sdk/angelscript/projects/meson/meson.build ---- angelscript-2.31.1.orig/sdk/angelscript/projects/meson/meson.build 2015-05-21 23:02:54.000000000 +0200 -+++ angelscript-2.31.1/sdk/angelscript/projects/meson/meson.build 2016-11-20 14:26:13.895259878 +0100 -@@ -1,59 +1,68 @@ --project('angelscript', 'cpp', 'c') -- --arch = run_command('uname', '-p').stdout().strip() --version = run_command(find_program('python3'), 'detect_ver.py').stdout().strip() -- --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 == 'armv7l' -- srcs = srcs + [ -- '../../source/as_callfunc_arm.cpp', -- '../../source/as_callfunc_arm_gcc.S' -- ] --endif -- --shared_library( -- 'angelscript', -- sources : srcs, -- install : true, -- soversion : '0', -- version : version, --) -- --install_headers('../../include/angelscript.h') -+project('angelscript', 'cpp', -+ version : run_command(find_program('python3'), 'detect_ver.py').stdout().strip(), -+ meson_version : '>=0.28.0', -+ license : 'zlib') -+ -+threads = dependency('threads') -+ -+angel_srcs = [ -+ '../../source/as_atomic.cpp', -+ '../../source/as_builder.cpp', -+ '../../source/as_bytecode.cpp', -+ '../../source/as_callfunc.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 host_machine.cpu_family() == 'arm' -+ add_languages('c') -+ angel_srcs += [ -+ '../../source/as_callfunc_arm.cpp', -+ '../../source/as_callfunc_arm_gcc.S', -+ ] -+endif -+ -+angelscript_version_num = run_command(find_program('python3'), 'detect_ver.py', '--num').stdout().strip() -+angelscript_lib = library( -+ 'angelscript', -+ sources : angel_srcs, -+ dependencies : threads, -+ version : angelscript_version_num, -+ install : true, -+) -+angelscript_inc = include_directories('../../include') -+angelscript_dep = declare_dependency( -+ link_with : angelscript_lib, -+ include_directories : angelscript_inc, -+ version : meson.project_version(), -+) -+ -+install_headers('../../include/angelscript.h') diff --git a/angelscript.spec b/angelscript.spec index c5abc4b..2c25837 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -4,19 +4,21 @@ Name: angelscript Version: 2.31.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Flexible cross-platform scripting library License: zlib URL: http://www.angelcode.com/angelscript/ Source0: %{url}/sdk/files/%{name}_%{version}.zip - -# Sent upstream via mail -Patch0: angelscript-2.31.1-meson.diff +# r2353 +Patch0001: 0001-Fixed-compiler-error-on-Linux-with-non-x86-64bit-pla.patch +# r2361 +Patch0002: 0002-Changes-to-meson-project-files.patch +# r2364 +Patch0003: 0003-Corrected-as_config.h-so-Linux-for-64bit-ARM-doesn-t.patch BuildRequires: meson - -ExclusiveArch: x86_64 %{ix86} %{arm} +BuildRequires: dos2unix %description The AngelScript library is a software library for easy integration of @@ -35,7 +37,9 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -c -p1 +%setup -q -c +find -type f -exec dos2unix {} ';' +%autopatch -p1 %build %meson @@ -57,6 +61,9 @@ developing applications that use %{name}. %{_includedir}/%{name}.h %changelog +* Fri Nov 25 2016 Igor Gnatenko - 2.31.1-3 +- Build on all architectures + * Sun Nov 20 2016 Igor Gnatenko - 2.31.1-2 - Fix FTBFS (RHBZ #1385042)