rpm/wine
SHA256
1
0
Fork 0
forked from pool/wine
Code Pull Requests Activity

Accepting request 615052 from Emulators

Browse Source 
- Fix aarch64 (by using clang)
- Enable win64 option for aarch64 (forwarded request 614998 from Guillaume_G)

OBS-URL: https://build.opensuse.org/request/show/615052
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=255
This commit is contained in:
Yuchen Lin 2018-06-13 13:36:47 +00:00 committed by Git OBS Bridge
commit 6299ec8564
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wine.changes
View File

@ -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 Fri May 25 19:20:01 UTC 2018 - meissner@suse.com

24
wine.spec
View File

@ -39,6 +39,9 @@ BuildRequires: alsa-devel
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: bison BuildRequires: bison
BuildRequires: capi4linux-devel BuildRequires: capi4linux-devel
%ifarch aarch64
BuildRequires: clang >= 5
%endif
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel
BuildRequires: desktop-file-utils 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//'` export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fomit-frame-pointer//'`
%endif %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} %if %{staging} || %{nine}
autoreconf -i -f autoreconf -i -f
%endif %endif
@ -226,7 +235,10 @@ autoreconf -i -f
CFLAGS="$RPM_OPT_FLAGS" \ CFLAGS="$RPM_OPT_FLAGS" \
%configure \ %configure \
--with-x \ --with-x \
%ifarch x86_64 %ifarch %{arm}
--with-float-abi=hard \
%endif
%ifarch x86_64 aarch64
--enable-win64 \ --enable-win64 \
%endif %endif
%if %{nine} %if %{nine}
@ -281,7 +293,7 @@ install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/
install -m 0755 %SOURCE2 %{buildroot}%{_bindir}/ install -m 0755 %SOURCE2 %{buildroot}%{_bindir}/
mv %{buildroot}/%{_mandir}/de.UTF-8 %{buildroot}/%{_mandir}/de mv %{buildroot}/%{_mandir}/de.UTF-8 %{buildroot}/%{_mandir}/de
mv %{buildroot}/%{_mandir}/fr.UTF-8 %{buildroot}/%{_mandir}/fr 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 mv %{buildroot}/%{_mandir}/pl.UTF-8 %{buildroot}/%{_mandir}/pl
%endif %endif
install -pm0644 -c %{SOURCE11} %{buildroot}/%{_mandir}/man1/ install -pm0644 -c %{SOURCE11} %{buildroot}/%{_mandir}/man1/
@ -362,12 +374,12 @@ chmod 755 %winedir/my-find-requires.sh
%{_bindir}/wisotool %{_bindir}/wisotool
%{_datadir}/wine %{_datadir}/wine
%{_datadir}/applications/wine.desktop %{_datadir}/applications/wine.desktop
%ifnarch x86_64 %ifnarch x86_64 aarch64
%doc %{_mandir}/man1/wine.1* %doc %{_mandir}/man1/wine.1*
%endif %endif
%doc %{_mandir}/man1/winedbg.1* %doc %{_mandir}/man1/winedbg.1*
%doc %{_mandir}/man1/wineserver.1* %doc %{_mandir}/man1/wineserver.1*
%ifnarch x86_64 %ifnarch x86_64 aarch64
%doc %dir %doc %{_mandir}/pl %doc %dir %doc %{_mandir}/pl
%doc %dir %doc %{_mandir}/pl/man1 %doc %dir %doc %{_mandir}/pl/man1
%doc %{_mandir}/*/man1/wine.1* %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
%dir %{_datadir}/icons/hicolor/scalable/apps %dir %{_datadir}/icons/hicolor/scalable/apps
%{_datadir}/icons/hicolor/scalable/apps/*.svg %{_datadir}/icons/hicolor/scalable/apps/*.svg
%ifarch %ix86 aarch64 %ifarch %ix86
%{_bindir}/wine %{_bindir}/wine
%{_bindir}/wine-preloader %{_bindir}/wine-preloader
%endif %endif
%ifarch ppc %arm %ifarch ppc %arm
%{_bindir}/wine %{_bindir}/wine
%endif %endif
%ifarch x86_64 %ifarch x86_64 aarch64
%{_bindir}/wine64 %{_bindir}/wine64
%{_bindir}/wine64-preloader %{_bindir}/wine64-preloader
%endif %endif