Re: emulators/qemu fails to build on NetBSD 4.0 (with workaround)

[Rhialto <rhialto%falu.nl@localhost>]

This compiles. Haven't run it yet.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile    24 Dec 2007 10:18:22 -0000      1.50
+++ Makefile    16 Mar 2008 02:45:46 -0000
@@ -22,7 +22,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-GCC_REQD+=             3.0
+GCC_REQD+=             3.4
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-4*)
 USE_PKGSRC_GCC=        yes
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/distinfo,v
retrieving revision 1.36
diff -u -r1.36 distinfo
--- distinfo    30 Dec 2007 17:12:44 -0000      1.36
+++ distinfo    16 Mar 2008 02:45:46 -0000
@@ -7,7 +7,7 @@
 SHA1 (patch-ab) = 29870b0bec5f9fa08267dfb9208d75d1d735714a
 SHA1 (patch-ac) = f3f37f2e72de28077a6579b12ecb2ea6650eea85
 SHA1 (patch-ad) = ac69a03e4945e8c8fd5aadca070b876d0970910d
-SHA1 (patch-ag) = 8480b6f840bcad845d76df996f913d2ad6750b8c
+SHA1 (patch-ag) = 744291e69dd8a90440052ac56bab22fc5e18a01d
 SHA1 (patch-ak) = 11669ec0ac62c0c90b7d2bfecb1f6efe3cb82fd2
 SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
 SHA1 (patch-ao) = e92d56f991cf29f83e39464f9e695caa86fe5fe0
@@ -17,3 +17,4 @@
 SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
 SHA1 (patch-ay) = 2d3051685878abe077abdbba9681bd04e04c7fb3
 SHA1 (patch-ba) = 7c5043a39405f52b512e479a46fc76108580b7bc
+SHA1 (patch-za) = 0d35909d693b4c6c020b70b72a9561d72543e585
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/qemu/patches/patch-ag,v
retrieving revision 1.9
diff -u -r1.9 patch-ag
--- patches/patch-ag    30 Dec 2007 17:12:45 -0000      1.9
+++ patches/patch-ag    16 Mar 2008 02:45:46 -0000
@@ -41,10 +41,10 @@
 +cat > $TMPC <<EOF
 +extern int foo;
 +EOF
-+if "$cc" -o $TMPE $TMPC -fno-stack-protector 2> /dev/null ; then
-+  stack_protector_present="no"
-+else
++if "$cc" -c -o $TMPE $TMPC -fno-stack-protector 2> /dev/null ; then
 +  stack_protector_present="yes"
++else
++  stack_protector_present="no"
 +fi
 +
  #

patch-za was needed on amd64/3.0:

--- fpu/softfloat-native.c.dist 2007-02-06 00:01:54.000000000 +0100
+++ fpu/softfloat-native.c      2007-09-19 21:01:41.000000000 +0200
@@ -223,7 +223,8 @@
 *----------------------------------------------------------------------------*/
 float64 float64_trunc_to_int( float64 a STATUS_PARAM )
 {
-    return trunc(a);
+    /*return trunc(a);*/
+    return floor(a);   /* loses precision? */
 }
 
 float64 float64_round_to_int( float64 a STATUS_PARAM )

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert      -- You author it, and I'll reader it.
\X/ rhialto/at/xs4all.nl        -- Cetero censeo "authored" delendum esse.