CVS commit: pkgsrc/emulators/qemu

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Sep 10 13:10:58 UTC 2021

Modified Files:
        pkgsrc/emulators/qemu: Makefile
Added Files:
        pkgsrc/emulators/qemu/patches: patch-configure

Log Message:
qemu: Patch out silly insistence on being compiled with GCC 7.5.0


To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r0 -r1.34 pkgsrc/emulators/qemu/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.286 pkgsrc/emulators/qemu/Makefile:1.287
--- pkgsrc/emulators/qemu/Makefile:1.286        Wed Sep  8 21:05:01 2021
+++ pkgsrc/emulators/qemu/Makefile      Fri Sep 10 13:10:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.286 2021/09/08 21:05:01 nia Exp $
+# $NetBSD: Makefile,v 1.287 2021/09/10 13:10:58 nia Exp $
 
 DISTNAME=      qemu-6.1.0
 PKGNAME=       ${DISTNAME:S/-rc/rc/}
@@ -20,6 +20,9 @@ USE_TOOLS+=           bison flex makeinfo perl:bu
 UNLIMIT_RESOURCES=     datasize
 HAS_CONFIGURE=         yes
 
+# https://github.com/qemu/qemu/commit/56208a0d473c6db263cc333c787ca48b502d72ab
+GCC_REQD+=             7
+
 PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-sphinx-rtd-theme>=0.4.3:../../textproc/py-sphinx-rtd-theme
 

Added files:

Index: pkgsrc/emulators/qemu/patches/patch-configure
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-configure:1.34
--- /dev/null   Fri Sep 10 13:10:58 2021
+++ pkgsrc/emulators/qemu/patches/patch-configure       Fri Sep 10 13:10:58 2021
@@ -0,0 +1,21 @@
+$NetBSD: patch-configure,v 1.34 2021/09/10 13:10:58 nia Exp $
+
+Allow the compiler from NetBSD 9.0.
+
+Requiring a minor version of GCC makes no sense, and indeed,
+the requirement seems to be 7.5.0 because "Ubuntu has that
+version"...
+
+https://github.com/qemu/qemu/commit/56208a0d473c6db263cc333c787ca48b502d72ab
+
+--- configure.orig     2021-08-24 17:35:40.000000000 +0000
++++ configure
+@@ -2099,7 +2099,7 @@ cat > $TMPC << EOF
+ #  endif
+ # endif
+ #elif defined(__GNUC__) && defined(__GNUC_MINOR__)
+-# if __GNUC__ < 7 || (__GNUC__ == 7 && __GNUC_MINOR__ < 5)
++# if __GNUC__ < 7
+ #  error You need at least GCC v7.5.0 to compile QEMU
+ # endif
+ #else