[arch-commits] Commit in wine/trunk (PKGBUILD)

[Felix Yan]

    Date: Wednesday, December 9, 2015 @ 17:59:51
  Author: fyan
Revision: 151282

upgpkg: wine 1.8rc3-2

rebuild with -O2

Modified:
  wine/trunk/PKGBUILD

----------+
 PKGBUILD |   24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-09 16:52:47 UTC (rev 151281)
+++ PKGBUILD	2015-12-09 16:59:51 UTC (rev 151282)
@@ -6,7 +6,7 @@
 
 pkgname=wine
 pkgver=1.8rc3
-pkgrel=1
+pkgrel=2
 
 _pkgbasever=${pkgver/rc/-rc}
 
@@ -101,27 +101,21 @@
 fi
 
 prepare() {
-  cd $pkgname-$_pkgbasever
+  # Allow ccache to work
+  mv $pkgname-$_pkgbasever $pkgname
 
-  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
-}
+  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
 
-build() {
-  cd "$srcdir"
+  # These additional CPPFLAGS solve FS#27662 and FS#34195
+  export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
 
-  # remove once https://bugs.winehq.org/show_bug.cgi?id=38653 is resolved
-  export CFLAGS="${CFLAGS/-O2/} -O0"
-  export CXXFLAGS="${CXXFLAGS/-O2/} -O0"
-
-  # Allow ccache to work
-  mv $pkgname-$_pkgbasever $pkgname
-
   # Get rid of old build dirs
   rm -rf $pkgname-{32,64}-build
   mkdir $pkgname-32-build
+}
 
-  # These additional CPPFLAGS solve FS#27662 and FS#34195
-  export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
+build() {
+  cd "$srcdir"
 
   if [[ $CARCH == x86_64 ]]; then
     msg2 "Building Wine-64..."