From 3fca3ee80a9d37dacbc0c366de19eb737c188cfc9a91714751a4190084fa4b54 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Thu, 7 Jun 2018 18:49:34 +0000
Subject: [PATCH] Accepting request 614998 from
 home:Guillaume_G:branches:openSUSE:Factory:ARM

- Fix aarch64 (by using clang)
- Enable win64 option for aarch64

OBS-URL: https://build.opensuse.org/request/show/614998
OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=514
---
 wine.changes |  6 ++++++
 wine.spec    | 24 ++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/wine.changes b/wine.changes
index 54a6985..56b2d3d 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun  7 11:41:33 UTC 2018 - guillaume.gardet@opensuse.org
+
+- Fix aarch64 (by using clang)
+- Enable win64 option for aarch64
+
 -------------------------------------------------------------------
 Fri May 25 19:20:01 UTC 2018 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index 1ba45f7..bd40d77 100644
--- a/wine.spec
+++ b/wine.spec
@@ -39,6 +39,9 @@ BuildRequires:  alsa-devel
 BuildRequires:  autoconf
 BuildRequires:  bison
 BuildRequires:  capi4linux-devel
+%ifarch aarch64
+BuildRequires:  clang >= 5
+%endif
 BuildRequires:  cups-devel
 BuildRequires:  dbus-1-devel
 BuildRequires:  desktop-file-utils
@@ -217,6 +220,12 @@ export WIDL_TIME_OVERRIDE="0" 	# for reproducible builds.
 export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fomit-frame-pointer//'`
 %endif
 
+%ifarch aarch64
+# ARM64 now requires clang
+# https://source.winehq.org/git/wine.git/commit/8fb8cc03c3edb599dd98f369e14a08f899cbff95
+export CC="/usr/bin/clang"
+%endif
+
 %if %{staging} || %{nine}
 autoreconf -i -f
 %endif
@@ -226,7 +235,10 @@ autoreconf -i -f
 CFLAGS="$RPM_OPT_FLAGS" \
 %configure \
 	--with-x \
-%ifarch x86_64
+%ifarch %{arm}
+	--with-float-abi=hard \
+%endif
+%ifarch x86_64 aarch64
         --enable-win64 \
 %endif
 %if %{nine}
@@ -281,7 +293,7 @@ install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/
 install -m 0755 %SOURCE2 %{buildroot}%{_bindir}/
 mv %{buildroot}/%{_mandir}/de.UTF-8 %{buildroot}/%{_mandir}/de
 mv %{buildroot}/%{_mandir}/fr.UTF-8 %{buildroot}/%{_mandir}/fr
-%ifnarch x86_64
+%ifnarch x86_64 aarch64
 mv %{buildroot}/%{_mandir}/pl.UTF-8 %{buildroot}/%{_mandir}/pl
 %endif
 install -pm0644 -c %{SOURCE11} %{buildroot}/%{_mandir}/man1/
@@ -362,12 +374,12 @@ chmod 755 %winedir/my-find-requires.sh
 %{_bindir}/wisotool
 %{_datadir}/wine
 %{_datadir}/applications/wine.desktop
-%ifnarch x86_64
+%ifnarch x86_64 aarch64
 %doc %{_mandir}/man1/wine.1*
 %endif
 %doc %{_mandir}/man1/winedbg.1*
 %doc %{_mandir}/man1/wineserver.1*
-%ifnarch x86_64
+%ifnarch x86_64 aarch64
 %doc %dir %doc %{_mandir}/pl
 %doc %dir %doc %{_mandir}/pl/man1
 %doc %{_mandir}/*/man1/wine.1*
@@ -396,14 +408,14 @@ chmod 755 %winedir/my-find-requires.sh
 %dir %{_datadir}/icons/hicolor/scalable
 %dir %{_datadir}/icons/hicolor/scalable/apps
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
-%ifarch %ix86 aarch64
+%ifarch %ix86
 %{_bindir}/wine
 %{_bindir}/wine-preloader
 %endif
 %ifarch ppc %arm
 %{_bindir}/wine
 %endif
-%ifarch x86_64
+%ifarch x86_64 aarch64
 %{_bindir}/wine64
 %{_bindir}/wine64-preloader
 %endif