[wine-mono] Add patch for CLI compile issue with gcc5
mooninite
mooninite at fedoraproject.org
Sun Mar 8 06:12:26 UTC 2015
commit 09a96f371c392f78aead77127ed4f9aa07727a6c
Author: Michael Cronenworth <mike at cchtml.com>
Date: Sun Mar 8 00:12:11 2015 -0600
Add patch for CLI compile issue with gcc5
wine-mono-build-cflags.patch | 10 ++++++++++
wine-mono.spec | 7 ++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/wine-mono-build-cflags.patch b/wine-mono-build-cflags.patch
new file mode 100644
index 0000000..da519ce
--- /dev/null
+++ b/wine-mono-build-cflags.patch
@@ -0,0 +1,10 @@
+--- wine-mono-4.5.6/build-winemono.sh.orig 2015-03-02 11:21:51.000000000 -0600
++++ wine-mono-4.5.6/build-winemono.sh 2015-03-07 23:40:43.725956614 -0600
+@@ -108,6 +108,7 @@
+
+ cd "$CURDIR/build-cross-cli"
+ if test 1 != $REBUILD || test ! -e Makefile; then
++ CFLAGS="-O0 -g -pipe -Wall -Werror=format-security -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -mtune=generic" \
+ ../mono/configure --prefix="$CURDIR/build-cross-cli-install" --with-mcs-docs=no --disable-system-aot || exit 1
+ fi
+ if test 1 = $USE_MONOLITE; then
diff --git a/wine-mono.spec b/wine-mono.spec
index 7f9dc3a..e2fd124 100644
--- a/wine-mono.spec
+++ b/wine-mono.spec
@@ -2,7 +2,7 @@
Name: wine-mono
Version: 4.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Mono library required for Wine
License: GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1
@@ -12,6 +12,7 @@ Source0: http://sourceforge.net/projects/wine/files/Wine%20Mono/%{version
Patch0: wine-mono-build-msifilename.patch
# https://github.com/mono/mono/commit/1445d4821c8091c395264542344dca9df22a2c82
Patch1: wine-mono-valgrind.patch
+Patch2: wine-mono-build-cflags.patch
# see git://github.com/madewokherd/wine-mono
@@ -52,6 +53,7 @@ Windows Mono library required for Wine.
%setup -q
%patch0 -p1 -b.msifilename
%patch1 -dmono -p1 -b.valgrind
+%patch2 -p1 -b.cflags
%build
MAKEOPTS=%{_smp_mflags} MSIFILENAME=wine-mono-%{version}.msi ./build-winemono.sh
@@ -88,6 +90,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE
%{_datadir}/wine/mono/wine-mono-%{version}.msi
%changelog
+* Sun Mar 08 2015 Michael Cronenworth <mike at cchtml.com> - 4.5.6-2
+- disable optimizations in CLI, workaround for gcc5
+
* Fri Mar 06 2015 Michael Cronenworth <mike at cchtml.com> - 4.5.6-1
- version upgrade
More information about the scm-commits
mailing list