[arch-commits] Commit in vbam/trunk (PKGBUILD cxx11-fixes.patch)

[Evangelos Foutras]

    Date: Monday, December 7, 2015 @ 22:30:30
  Author: foutrelis
Revision: 150133

Fix build on i686

Added:
  vbam/trunk/cxx11-fixes.patch
Modified:
  vbam/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   17 +++++++++-------
 cxx11-fixes.patch |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-07 21:14:58 UTC (rev 150132)
+++ PKGBUILD	2015-12-07 21:30:30 UTC (rev 150133)
@@ -16,16 +16,19 @@
              'openal' 'subversion' 'wxgtk')
 makedepends_i686=('nasm')
 options=('!emptydirs')
-source=("vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=1465")
-sha256sums=('SKIP')
+source=("vbam::svn+http://svn.code.sf.net/p/vbam/code/trunk#revision=1465"
+        'cxx11-fixes.patch')
+sha256sums=('SKIP'
+            '610d770bfcea8da990cddc33c6360b572bc20683b216ab1e6f23424e9d494417')
 
-build() {
+prepare() {
   cd vbam
+  patch -Np1 -i ../cxx11-fixes.patch
+  mkdir build
+}
 
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build && cd build
+build() {
+  cd vbam/build
 
   _cmakeargs="-DCMAKE_BUILD_TYPE='Release' \
               -DCMAKE_INSTALL_PREFIX='/usr' \

Added: cxx11-fixes.patch
===================================================================
--- cxx11-fixes.patch	                        (rev 0)
+++ cxx11-fixes.patch	2015-12-07 21:30:30 UTC (rev 150133)
@@ -0,0 +1,53 @@
+diff -uprb vbam.orig/src/gba/GBA-arm.cpp vbam/src/gba/GBA-arm.cpp
+--- vbam.orig/src/gba/GBA-arm.cpp	2015-12-07 23:23:30.613871906 +0200
++++ vbam/src/gba/GBA-arm.cpp	2015-12-07 23:25:49.425706904 +0200
+@@ -298,18 +298,18 @@ static void count(u32 opcode, int cond_r
+ #ifdef __GNUC__
+  #define ALU_HEADER           asm("mov %%ecx, %%edi; "
+  #define ALU_TRAILER          : "=D" (opcode) : "c" (opcode) : "eax", "ebx", "edx", "esi")
+- #define EMIT0(op)            #op"; "
+- #define EMIT1(op,arg)        #op" "arg"; "
+- #define EMIT2(op,src,dest)   #op" "src", "dest"; "
+- #define KONST(val)           "$"#val
++ #define EMIT0(op)            #op "; "
++ #define EMIT1(op,arg)        #op " " arg "; "
++ #define EMIT2(op,src,dest)   #op " " src ", " dest "; "
++ #define KONST(val)           "$" #val
+  #define ASMVAR(cvar)         ASMVAR2 (__USER_LABEL_PREFIX__, cvar)
+  #define ASMVAR2(prefix,cvar) STRING (prefix) cvar
+  #define STRING(x)            #x
+  #define VAR(var)             ASMVAR(#var)
+  #define VARL(var)            ASMVAR(#var)
+- #define REGREF1(index)       ASMVAR("reg("index")")
+- #define REGREF2(index,scale) ASMVAR("reg(,"index","#scale")")
+- #define LABEL(n)             #n": "
++ #define REGREF1(index)       ASMVAR("reg(" index ")")
++ #define REGREF2(index,scale) ASMVAR("reg(," index "," #scale ")")
++ #define LABEL(n)             #n ": "
+  #define LABELREF(n,dir)      #n#dir
+  #define al "%%al"
+  #define ah "%%ah"
+diff -uprb vbam.orig/src/gba/GBA-thumb.cpp vbam/src/gba/GBA-thumb.cpp
+--- vbam.orig/src/gba/GBA-thumb.cpp	2015-12-07 23:23:30.613871906 +0200
++++ vbam/src/gba/GBA-thumb.cpp	2015-12-07 23:26:23.646159392 +0200
+@@ -305,15 +305,15 @@ static INSN_REGPARM void thumbBreakpoint
+                 V_FLAG = (Flags >> 26) & 1;			\
+             }
+ #else
+-  #define EMIT1(op,arg)        #op" "arg"; "
+-  #define EMIT2(op,src,dest)   #op" "src", "dest"; "
+-  #define KONST(val)           "$"#val
++  #define EMIT1(op,arg)        #op " " arg "; "
++  #define EMIT2(op,src,dest)   #op " " src ", " dest "; "
++  #define KONST(val)           "$" #val
+   #define ASMVAR(cvar)         ASMVAR2 (__USER_LABEL_PREFIX__, cvar)
+   #define ASMVAR2(prefix,cvar) STRING (prefix) cvar
+   #define STRING(x)            #x
+   #define VAR(var)             ASMVAR(#var)
+-  #define REGREF1(index)       ASMVAR("reg("index")")
+-  #define REGREF2(index,scale) ASMVAR("reg(,"index","#scale")")
++  #define REGREF1(index)       ASMVAR("reg(" index ")")
++  #define REGREF2(index,scale) ASMVAR("reg(," index "," #scale ")")
+   #define eax "%%eax"
+   #define ecx "%%ecx"
+   #define edx "%%edx"