From 4e9358988ef0c95fe1b2a72604016d608d10130cba80e281a4bf46b7de83160f Mon Sep 17 00:00:00 2001
From: Hammer Faceman <nook.puncher@gmail.com>
Date: Thu, 4 May 2017 20:59:28 +0000
Subject: [PATCH] Accepting request 492933 from home:Warhammer40k:Mono:Factory

OBS-URL: https://build.opensuse.org/request/show/492933
OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=181
---
 mono-core.changes |  7 +++++++
 mono-core.spec    | 23 ++++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/mono-core.changes b/mono-core.changes
index 057ce1c..cd7f320 100644
--- a/mono-core.changes
+++ b/mono-core.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 4 12:00:00 UTC 2017 - fwdsbs.to.11df@xoxy.net
+
+- Enable external BTLS library build only on supported platforms (x86 and x86_64 right now):
+  * Fix build for arm, arm64, ppc64, ppc64le.
+- Enable pedump binary packaging for arm64 builds.
+
 -------------------------------------------------------------------
 Fri Apr 28 15:00:00 UTC 2017 - fwdsbs.to.11df@xoxy.net
 
diff --git a/mono-core.spec b/mono-core.spec
index 41ed03e..5e044c2 100644
--- a/mono-core.spec
+++ b/mono-core.spec
@@ -25,6 +25,13 @@
 %define boehm yes
 %endif
 
+%ifarch %ix86 x86_64
+%define btls yes
+%else
+%define btls no
+%endif
+
+
 Name:           mono-core
 Version:        4.8.1
 Release:        0
@@ -201,10 +208,12 @@ export PATH=/opt/novell/llvm-mono/bin:$PATH
 %endif
 %ifnarch %ix86 x86_64
   --disable-system-aot \
+%endif
+%if %btls == yes
+  --enable-dynamic-btls \
 %endif
   --with-ikvm=yes \
-  --with-moonlight=no \
-  --enable-dynamic-btls
+  --with-moonlight=no
 make
 
 %install
@@ -312,7 +321,6 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
 %{_bindir}/setreg
 %{_bindir}/sn
 %{_libdir}/libMonoPosixHelper.so*
-%{_libdir}/libmono-btls-shared.so*
 %{_libdir}/libikvm-native.so
 %{_mandir}/man1/cert-sync.1%ext_man
 %{_mandir}/man1/certmgr.1%ext_man
@@ -348,7 +356,6 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
 %{_prefix}/lib/mono/4.5/ICSharpCode.SharpZipLib.dll
 %{_prefix}/lib/mono/4.5/Microsoft.CSharp.dll
 %{_prefix}/lib/mono/4.5/Microsoft.VisualC.dll
-%{_prefix}/lib/mono/4.5/Mono.Btls.Interface.dll
 %{_prefix}/lib/mono/4.5/Mono.CSharp.dll
 %{_prefix}/lib/mono/4.5/Mono.Cairo.dll
 %{_prefix}/lib/mono/4.5/Mono.CompilerServices.SymbolWriter.dll
@@ -394,7 +401,6 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
 %{_prefix}/lib/mono/gac/ICSharpCode.SharpZipLib
 %{_prefix}/lib/mono/gac/Microsoft.CSharp
 %{_prefix}/lib/mono/gac/Microsoft.VisualC
-%{_prefix}/lib/mono/gac/Mono.Btls.Interface
 %{_prefix}/lib/mono/gac/Mono.CSharp
 %{_prefix}/lib/mono/gac/Mono.Cairo
 %{_prefix}/lib/mono/gac/Mono.Cecil
@@ -434,6 +440,11 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
 %{_prefix}/lib/mono/gac/System.IO.Compression
 %{_prefix}/lib/mono/gac/cscompmgd
 %{_prefix}/lib/mono/mono-configuration-crypto
+%if %btls == yes
+%{_libdir}/libmono-btls-shared.so*
+%{_prefix}/lib/mono/4.5/Mono.Btls.Interface.dll
+%{_prefix}/lib/mono/gac/Mono.Btls.Interface
+%endif
 
 %post
 cert-sync /etc/ssl/ca-bundle.pem
@@ -1187,9 +1198,7 @@ Mono development tools.
 %{_bindir}/monop2
 %{_bindir}/mprof-report
 %{_bindir}/pdb2mdb
-%if %boehm == yes
 %{_bindir}/pedump
-%endif
 %{_bindir}/permview
 %{_bindir}/prj2make
 %{_bindir}/resgen