- pass AR to remove 'l' option, which changed meaning

- added asm fix to morearchs patch
- added -Wno-missing-braces to avoid massive warning messages

diff --git a/Glide_VG-morearchs.patch b/Glide_VG-morearchs.patch
index 3eb438c4c12b65b9da57cfbef65046e6813e5585..1029fcbe75a2d138294528e22827ce8699f0dc31 100644 (file)
--- a/Glide_VG-morearchs.patch
+++ b/Glide_VG-morearchs.patch
@@ -87,9 +87,11 @@
  
  
  void double_precision_asm() {
+-  asm("push %eax \n fnclex \n fstcw (%esp) \n movw (%esp), %eax \n "
+-      "and $0x0000fcff, %eax \n or $0x000002ff, %eax \n mov %eax, (%esp) \n "
 +#ifdef __i386__
-   asm("push %eax \n fnclex \n fstcw (%esp) \n movw (%esp), %eax \n "
-       "and $0x0000fcff, %eax \n or $0x000002ff, %eax \n mov %eax, (%esp) \n "
++  asm("push %eax \n fnclex \n fstcw (%esp) \n movl (%esp), %eax \n "
++      "and $0x0000fcff, %eax \n or $0x000002ff, %eax \n movl %eax, (%esp) \n "
        "fldcw (%esp) \n pop %eax");
 +#endif
  }

diff --git a/Glide_VG.spec b/Glide_VG.spec
index 20e7abee7d552c26dc0f5ddaa43616441e0789d7..aad4314553d135e563f22361bf86d3bec9a78178 100644 (file)
--- a/Glide_VG.spec
+++ b/Glide_VG.spec
@@ -82,8 +82,9 @@ chmod +x swlibs/include/make/ostype
 
 %build
 %{__make} -j1 -f makefile.unix \
+       AR="ar rcs" \
        CC="%{__cc}" \
-       CNODEBUG="%{rpmcflags} -fPIC %{!?debug:-fomit-frame-pointer} \
+       CNODEBUG="%{rpmcflags} -fPIC -Wno-missing-braces %{!?debug:-fomit-frame-pointer} \
        %{!?debug:-funroll-loops -fexpensive-optimizations -ffast-math}" \
 %ifnarch %{ix86}
        FX_GLIDE_CTRISETUP=1