From 786f705158425bf2cf23c801dad1321b8d105ce4 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Wed, 24 Aug 2016 16:30:46 +0200 Subject: [PATCH] applying a patch to avoid build failure on ARM, related to Fast TLS --- mono-4.6.0-patch_arm_fast_tls.patch | 11 +++++++++++ mono.spec | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 mono-4.6.0-patch_arm_fast_tls.patch diff --git a/mono-4.6.0-patch_arm_fast_tls.patch b/mono-4.6.0-patch_arm_fast_tls.patch new file mode 100644 index 0000000..0e05633 --- /dev/null +++ b/mono-4.6.0-patch_arm_fast_tls.patch @@ -0,0 +1,11 @@ +--- a/mono/mini/mini-arm.c 2016-08-24 15:25:42.253619745 +0200 ++++ b/mono/mini/mini-arm.c 2016-08-24 15:26:00.124173662 +0200 +@@ -34,7 +34,7 @@ + #if (defined(HAVE_KW_THREAD) && defined(__linux__) && defined(__ARM_EABI__)) \ + || defined(TARGET_ANDROID) \ + || (defined(TARGET_IOS) && !defined(TARGET_WATCHOS)) +-#define HAVE_FAST_TLS ++//#define HAVE_FAST_TLS + #endif + + /* Sanity check: This makes no sense */ diff --git a/mono.spec b/mono.spec index ecedc8f..d157597 100644 --- a/mono.spec +++ b/mono.spec @@ -33,6 +33,7 @@ Patch1: mono-4.0.0-libgdiplusconfig.patch Patch2: mono-4.2.1-ppc.patch Patch3: mono-4.3.2-find-provides.patch Patch4: mono-4.2-fix-winforms-trayicon.patch +Patch5: mono-4.6.0-patch_arm_fast_tls.patch BuildRequires: bison BuildRequires: gcc-c++ @@ -273,6 +274,7 @@ Development file for monodoc %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # Add undeclared Arg sed -i "61a #define ARG_MAX _POSIX_ARG_MAX" mono/io-layer/wapi_glob.h