CVS commit: pkgsrc/sysutils/xentools413

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Wed Sep 22 21:18:12 UTC 2021

Modified Files:
        pkgsrc/sysutils/xentools413: Makefile distinfo
        pkgsrc/sysutils/xentools413/patches: patch-tools_qemu-xen_configure

Log Message:
Needs gsed to build on HEAD
PR pkg/56411 also apply, so pretend that eventfd support is not there.
To be revisited after the freeze.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/sysutils/xentools413/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/xentools413/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/xentools413/patches/patch-tools_qemu-xen_configure

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

Modified files:

Index: pkgsrc/sysutils/xentools413/Makefile
diff -u pkgsrc/sysutils/xentools413/Makefile:1.21 pkgsrc/sysutils/xentools413/Makefile:1.22
--- pkgsrc/sysutils/xentools413/Makefile:1.21   Tue Sep 21 13:20:47 2021
+++ pkgsrc/sysutils/xentools413/Makefile        Wed Sep 22 21:18:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/09/21 13:20:47 bouyer Exp $
+# $NetBSD: Makefile,v 1.22 2021/09/22 21:18:12 bouyer Exp $
 #
 VERSION=       4.13.4
 
@@ -51,7 +51,7 @@ CHECK_RELRO_SKIP=     libexec/xen/boot/hvmlo
 EGDIR=                 ${PREFIX}/share/examples/xen
 MESSAGE_SUBST+=                EGDIR=${EGDIR}
 
-USE_TOOLS+=            pod2man gmake pkg-config makeinfo perl bash cmake
+USE_TOOLS+=            pod2man gmake pkg-config makeinfo perl bash cmake gsed
 USE_LANGUAGES=         c c++
 
 GNU_CONFIGURE=         YES

Index: pkgsrc/sysutils/xentools413/distinfo
diff -u pkgsrc/sysutils/xentools413/distinfo:1.11 pkgsrc/sysutils/xentools413/distinfo:1.12
--- pkgsrc/sysutils/xentools413/distinfo:1.11   Tue Sep 21 13:20:47 2021
+++ pkgsrc/sysutils/xentools413/distinfo        Wed Sep 22 21:18:12 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2021/09/21 13:20:47 bouyer Exp $
+$NetBSD: distinfo,v 1.12 2021/09/22 21:18:12 bouyer Exp $
 
 SHA1 (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = b78d21457bc07b4c4d3e770109c169ddafdacdf5
 RMD160 (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = 846dbcc0f56e87fca8c87b00ca2ed031471d4246
@@ -81,7 +81,7 @@ SHA1 (patch-tools_qemu-xen-traditional_i
 SHA1 (patch-tools_qemu-xen-traditional_net.c) = 0999993172070db5dc8d7c7daaa4999a3edaadb8
 SHA1 (patch-tools_qemu-xen-traditional_xen-hooks.mak) = 528878c8465d75b63e044e4f6c89609e4edbc3e0
 SHA1 (patch-tools_qemu-xen_audio_audio.c) = a7f47ff0350900bcb99b5515eeee162144a98cf8
-SHA1 (patch-tools_qemu-xen_configure) = 38eee924f66c226a09c2408312fc0f67d99d2b81
+SHA1 (patch-tools_qemu-xen_configure) = fe16110e33158ca446fb191c64621bf80b76dea9
 SHA1 (patch-tools_qemu-xen_net_tap-bsd.c) = ac1ed72daeb051eae7352542630a9a02c99e485e
 SHA1 (patch-tools_qemu-xen_net_tap.c) = 53d8c1799136c412b775d7d02d72b1abc63f4dd3
 SHA1 (patch-tools_qemu-xen_qemu-doc.texi) = e72d480ec29829055f01226eaf020d4cbd100d5d

Index: pkgsrc/sysutils/xentools413/patches/patch-tools_qemu-xen_configure
diff -u pkgsrc/sysutils/xentools413/patches/patch-tools_qemu-xen_configure:1.1 pkgsrc/sysutils/xentools413/patches/patch-tools_qemu-xen_configure:1.2
--- pkgsrc/sysutils/xentools413/patches/patch-tools_qemu-xen_configure:1.1      Tue May 26 11:12:11 2020
+++ pkgsrc/sysutils/xentools413/patches/patch-tools_qemu-xen_configure  Wed Sep 22 21:18:12 2021
@@ -1,9 +1,10 @@
-$NetBSD: patch-tools_qemu-xen_configure,v 1.1 2020/05/26 11:12:11 bouyer Exp $
+$NetBSD: patch-tools_qemu-xen_configure,v 1.2 2021/09/22 21:18:12 bouyer Exp $
 
 -lrt is needed for shm_open()
+-stopgap measure to make the package build on HEAD: ignore eventfd
 
---- tools/qemu-xen/configure.orig      2019-09-27 12:21:35.000000000 +0200
-+++ tools/qemu-xen/configure   2020-05-08 20:09:00.341400664 +0200
+--- tools/qemu-xen/configure.orig      2020-11-06 16:32:03.000000000 +0100
++++ tools/qemu-xen/configure   2021-09-22 22:09:20.075746457 +0200
 @@ -841,6 +841,7 @@
    audio_drv_list="oss try-sdl"
    audio_possible_drivers="oss sdl"
@@ -12,3 +13,11 @@ $NetBSD: patch-tools_qemu-xen_configure,
    HOST_VARIANT_DIR="netbsd"
    supported_os="yes"
  ;;
+@@ -4440,6 +4441,7 @@
+ if compile_prog "" "" ; then
+   eventfd=yes
+ fi
++eventfd=no
+ 
+ # check if memfd is supported
+ memfd=no