Attachment 14465 Details for Bug 32972 – wine.spec patch build/compiling options

[patch] wine.spec patch build/compiling options

003-wine-stages-m10.patch (text/plain), 3.65 KB, created by Aurelian R on 2024-03-15 22:22:35 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2024-03-15 22:22:35 CET

Size: 3.65 KB

patch

obsolete

>--- wine-mga10-SVN-P1+P2.spec	2024-03-15 10:58:05.030258860 +0200
>+++ wine-mga10-SVN-P1+P2+P3.spec	2024-03-15 11:02:10.405669550 +0200
>@@ -339,27 +339,22 @@ MONO_VERSION=$(sed -rn 's,^#define\s+MON
> %build
> autoreconf -vfi
> 
>-%ifarch %ix86
>-# (Anssi 04/2008) mdvbug #39604
>-# Some protection systems complain "debugger detected" with our
>-# -fomit-frame-pointer flag, so disable it.
>-# It also causes some crashing issues, and the upstream workaround
>-# in configure script does not seem to work properly. -Anssi 12/2012
>-export CFLAGS="%{optflags} -fno-omit-frame-pointer"
>-%endif
>-
> # disable fortify as it breaks wine
> # https://bugs.winehq.org/show_bug.cgi?id=24606
> # https://bugs.winehq.org/show_bug.cgi?id=25073
>-# Disable Red Hat specs for package notes (Fedora 38+) and annobin.
>-# MinGW GCC does not support these options.
>-export LDFLAGS="$(echo "%{build_ldflags}" | sed -e 's/-Wl,-z,relro//' -e 's/-Wl,--build-id=sha1//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-package-notes//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//')"
>+%undefine _fortify_cflags
>+#Disable stack-protector: https://bugs.winehq.org/show_bug.cgi?id=55139
>+%undefine _ssp_cflags
>+export CFLAGS="%(echo "%{optflags}" | sed -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//')"
> %ifarch x86_64
>-export CFLAGS="$(echo "%{optflags}" | sed -e 's/-O2//' -e 's/-Wp,-D_FORTIFY_SOURCE=2//' -e 's/-fcf-protection//' -e 's/-fstack-protector-strong//' -e 's/-fstack-clash-protection//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//') -O2"
>-%else
>-export CFLAGS="$(echo "%{optflags}" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//' -e 's/-fcf-protection//' -e 's/-fstack-protector-strong//' -e 's/-fstack-clash-protection//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//')"
>+export CFLAGS="%(echo "%{optflags}" | sed -e 's/-O2//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//') -O2"
>+%endif
>+%ifarch armv7hl
>+export CFLAGS="%(echo "%{optflags}" | sed -e 's/-fexceptions//')"
> %endif
> 
>+%define _disable_ld_build_id 1
>+%define _disable_ld_relro 1
> %ifarch  %{arm} aarch64
> # Wine enabled -Wl,-WX that turns linker warnings into errors
> # Fedora passes '--as-needed' for all binaries and this is a warning from the linker, now an error, so disable flag for now
>@@ -368,11 +363,11 @@ sed -i 's/-Wl,-WX//g' configure
> # https://source.winehq.org/git/wine.git/commit/8fb8cc03c3edb599dd98f369e14a08f899cbff95
> export CC="/usr/bin/clang"
> # Our build_ldflags have stuff unsupported by lld
>-export LDFLAGS=$(echo "$LDFLAGS" | sed -e 's/-Wl,-O1//' -e 's/-Wl,--as-needed -Wl,--no-undefined//' -e 's/-Wl,--enable-new-dtags//')
>-%endif
>-%ifarch armv7hl
>-export CFLAGS="`echo $CFLAGS | sed -e 's/-fexceptions//'`"
>+%define _disable_ld_as_needed        1
>+%define _disable_ld_no_undefined     1
>+%define _disable_ld_enable_new_dtags 1
> %endif
>+export LDFLAGS="%{build_ldflags}"
> 
> # required so that both Linux and Windows development files can be found
> unset PKG_CONFIG_PATH
>@@ -381,6 +376,8 @@ unset PKG_CONFIG_PATH
> 		--with-x \
> 		--with-dbus \
> 		--with-pulse \
>+		--without-oss \
>+		--without-capi \
> %ifarch %{arm}
> 		--with-float-abi=hard \
> %endif
>@@ -407,13 +404,8 @@ mv %{buildroot}%{_bindir}/wine-preloader
> # remove rpath
> chrpath --delete %{buildroot}%{_bindir}/wmc
> chrpath --delete %{buildroot}%{_bindir}/wrc
>-%ifarch x86_64 aarch64
>-chrpath --delete %{buildroot}%{_bindir}/wine64
>+chrpath --delete %{buildroot}%{_bindir}/%{wine}
> chrpath --delete %{buildroot}%{_bindir}/wineserver
>-%else
>-chrpath --delete %{buildroot}%{_bindir}/wine
>-chrpath --delete %{buildroot}%{_bindir}/wineserver
>-%endif
> 
> # Allow users to launch Windows programs by just clicking on the .exe file...
> mkdir -p %{buildroot}%{_binfmtdir}

--- wine-mga10-SVN-P1+P2.spec	2024-03-15 10:58:05.030258860 +0200
+++ wine-mga10-SVN-P1+P2+P3.spec	2024-03-15 11:02:10.405669550 +0200
@@ -339,27 +339,22 @@ MONO_VERSION=$(sed -rn 's,^#define\s+MON
 %build
 autoreconf -vfi
 
-%ifarch %ix86
-# (Anssi 04/2008) mdvbug #39604
-# Some protection systems complain "debugger detected" with our
-# -fomit-frame-pointer flag, so disable it.
-# It also causes some crashing issues, and the upstream workaround
-# in configure script does not seem to work properly. -Anssi 12/2012
-export CFLAGS="%{optflags} -fno-omit-frame-pointer"
-%endif
-
 # disable fortify as it breaks wine
 # https://bugs.winehq.org/show_bug.cgi?id=24606
 # https://bugs.winehq.org/show_bug.cgi?id=25073
-# Disable Red Hat specs for package notes (Fedora 38+) and annobin.
-# MinGW GCC does not support these options.
-export LDFLAGS="$(echo "%{build_ldflags}" | sed -e 's/-Wl,-z,relro//' -e 's/-Wl,--build-id=sha1//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-package-notes//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//')"
+%undefine _fortify_cflags
+#Disable stack-protector: https://bugs.winehq.org/show_bug.cgi?id=55139
+%undefine _ssp_cflags
+export CFLAGS="%(echo "%{optflags}" | sed -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//')"
 %ifarch x86_64
-export CFLAGS="$(echo "%{optflags}" | sed -e 's/-O2//' -e 's/-Wp,-D_FORTIFY_SOURCE=2//' -e 's/-fcf-protection//' -e 's/-fstack-protector-strong//' -e 's/-fstack-clash-protection//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//') -O2"
-%else
-export CFLAGS="$(echo "%{optflags}" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//' -e 's/-fcf-protection//' -e 's/-fstack-protector-strong//' -e 's/-fstack-clash-protection//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//')"
+export CFLAGS="%(echo "%{optflags}" | sed -e 's/-O2//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//') -O2"
+%endif
+%ifarch armv7hl
+export CFLAGS="%(echo "%{optflags}" | sed -e 's/-fexceptions//')"
 %endif
 
+%define _disable_ld_build_id 1
+%define _disable_ld_relro 1
 %ifarch  %{arm} aarch64
 # Wine enabled -Wl,-WX that turns linker warnings into errors
 # Fedora passes '--as-needed' for all binaries and this is a warning from the linker, now an error, so disable flag for now
@@ -368,11 +363,11 @@ sed -i 's/-Wl,-WX//g' configure
 # https://source.winehq.org/git/wine.git/commit/8fb8cc03c3edb599dd98f369e14a08f899cbff95
 export CC="/usr/bin/clang"
 # Our build_ldflags have stuff unsupported by lld
-export LDFLAGS=$(echo "$LDFLAGS" | sed -e 's/-Wl,-O1//' -e 's/-Wl,--as-needed -Wl,--no-undefined//' -e 's/-Wl,--enable-new-dtags//')
-%endif
-%ifarch armv7hl
-export CFLAGS="`echo $CFLAGS | sed -e 's/-fexceptions//'`"
+%define _disable_ld_as_needed        1
+%define _disable_ld_no_undefined     1
+%define _disable_ld_enable_new_dtags 1
 %endif
+export LDFLAGS="%{build_ldflags}"
 
 # required so that both Linux and Windows development files can be found
 unset PKG_CONFIG_PATH
@@ -381,6 +376,8 @@ unset PKG_CONFIG_PATH
 		--with-x \
 		--with-dbus \
 		--with-pulse \
+		--without-oss \
+		--without-capi \
 %ifarch %{arm}
 		--with-float-abi=hard \
 %endif
@@ -407,13 +404,8 @@ mv %{buildroot}%{_bindir}/wine-preloader
 # remove rpath
 chrpath --delete %{buildroot}%{_bindir}/wmc
 chrpath --delete %{buildroot}%{_bindir}/wrc
-%ifarch x86_64 aarch64
-chrpath --delete %{buildroot}%{_bindir}/wine64
+chrpath --delete %{buildroot}%{_bindir}/%{wine}
 chrpath --delete %{buildroot}%{_bindir}/wineserver
-%else
-chrpath --delete %{buildroot}%{_bindir}/wine
-chrpath --delete %{buildroot}%{_bindir}/wineserver
-%endif
 
 # Allow users to launch Windows programs by just clicking on the .exe file...
 mkdir -p %{buildroot}%{_binfmtdir}

Actions: View | Diff

Attachments on bug 32972: 14462 | 14463 | 14464 | 14465