diff -ur wine.orig/PKGBUILD wine/PKGBUILD --- wine.orig/PKGBUILD 2012-08-14 07:08:03.000000000 +0300 +++ wine/PKGBUILD 2012-08-15 03:43:58.006280380 +0300 @@ -6,7 +6,7 @@ pkgname=wine pkgver=1.5.10 -pkgrel=1 +pkgrel=2 _pkgbasever=${pkgver/rc/-rc} @@ -91,7 +91,7 @@ # These additional CFLAGS solve FS#27662 export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" - export CXXFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" + export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" if [[ $CARCH == x86_64 ]]; then msg2 "Building Wine-64..." @@ -115,6 +115,10 @@ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" fi + # These additional CFLAGS solve FS#27560 + export CFLAGS="${CFLAGS} -m32 -mstackrealign -mincoming-stack-boundary=2" + export CXXFLAGS="${CXXFLAGS} -m32 -mstackrealign -mincoming-stack-boundary=2" + msg2 "Building Wine-32..." cd "$srcdir/$pkgname-32-build" ../$pkgname/configure \ @@ -123,8 +127,7 @@ --with-x \ "${_wine32opts[@]}" - # These additional CFLAGS solve FS#27560 - make CFLAGS+="-mstackrealign" CXXFLAGS+="-mstackrealign" + make } package() {