CVS commit: pkgsrc/sysutils/xentools413

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

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Fri Jun 24 13:46:46 UTC 2022

Modified Files:
        pkgsrc/sysutils/xentools413: Makefile distinfo
Added Files:
        pkgsrc/sysutils/xentools413/patches:
            patch-tools_ocaml_libs_xc_xenctrl_stubs.c
            patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c
            patch-tools_ocaml_libs_xl_xenlight_stubs.c

Log Message:
Fix build on netbsd-HEAD
Fix what looks like an incomplete conversion to egg.mk (PLIST commited but
not Makefile?)


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/xentools413/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/xentools413/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_libs_xc_xenctrl_stubs.c \
    pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c \
    pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_libs_xl_xenlight_stubs.c

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.28 pkgsrc/sysutils/xentools413/Makefile:1.29
--- pkgsrc/sysutils/xentools413/Makefile:1.28   Fri May 13 15:58:54 2022
+++ pkgsrc/sysutils/xentools413/Makefile        Fri Jun 24 13:46:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2022/05/13 15:58:54 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2022/06/24 13:46:46 bouyer Exp $
 #
 VERSION=       4.13.4
 
@@ -232,7 +232,7 @@ BUILDLINK_TRANSFORM+=       rm:-falign-jumps=1
 MAKE_ENV+=     EXTRA_HOSTCFLAGS=${EXTRA_HOSTCFLAGS:Q} EXTRA_CFLAGS=${EXTRA_CFLAGS:M*:Q} TARGET_CC=${TARGET_CC}
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/egg.mk"
 #.include "../../devel/SDL/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../devel/ocaml-findlib/buildlink3.mk"

Index: pkgsrc/sysutils/xentools413/distinfo
diff -u pkgsrc/sysutils/xentools413/distinfo:1.15 pkgsrc/sysutils/xentools413/distinfo:1.16
--- pkgsrc/sysutils/xentools413/distinfo:1.15   Fri May 13 15:58:54 2022
+++ pkgsrc/sysutils/xentools413/distinfo        Fri Jun 24 13:46:46 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2022/05/13 15:58:54 wiz Exp $
+$NetBSD: distinfo,v 1.16 2022/06/24 13:46:46 bouyer Exp $
 
 BLAKE2s (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = d2e88c1705b34d2d6ce59106702343e927686942f54b65ce047d29269fbdb393
 SHA512 (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = 0d96236385d241fdddafc88e8b4dac37298f2371b0c61055b78d6ce794166559127de2c110409c55738ca16c4a9e9e1834b03f7a2de85729d0a66cf5c313c9e8
@@ -61,6 +61,9 @@ SHA1 (patch-tools_libxl_libxl_uuid.c) = 
 SHA1 (patch-tools_ocaml_Makefile.rules) = 2198396f896999adb8ea05f100a0a5ec36733b1a
 SHA1 (patch-tools_ocaml_common.make) = 0e243aff97d8e8c6349f548dbbab878f3ca1acb6
 SHA1 (patch-tools_ocaml_libs_eventchn_xeneventchn_stubs.c) = 371e45af87b4432aedeaba1871aa94a4f492e011
+SHA1 (patch-tools_ocaml_libs_xc_xenctrl_stubs.c) = 9eb780bc22c918e3d864192ffad9a382e98542e4
+SHA1 (patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c) = 5be34a9150d8bc9874f7ebbc28ea58c5633771eb
+SHA1 (patch-tools_ocaml_libs_xl_xenlight_stubs.c) = efedd31bca5a20e981c5d5ada96d02c3001f3abb
 SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5
 SHA1 (patch-tools_ocaml_xenstored_utils.ml) = 5e85a0039d668c9b533e8deaa65fcdab9a5ad4c7
 SHA1 (patch-tools_qemu-xen-traditional_Makefile) = 5fbb55bf84f9856043be301d5d06530190fe9a60

Added files:

Index: pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_libs_xc_xenctrl_stubs.c
diff -u /dev/null pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_libs_xc_xenctrl_stubs.c:1.1
--- /dev/null   Fri Jun 24 13:46:46 2022
+++ pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_libs_xc_xenctrl_stubs.c       Fri Jun 24 13:46:46 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-tools_ocaml_libs_xc_xenctrl_stubs.c,v 1.1 2022/06/24 13:46:46 bouyer Exp $
+
+avoid xenctrl_stubs.c:46: error: "Val_none" redefined [-Werror]
+
+--- ./tools/ocaml/libs/xc/xenctrl_stubs.c.orig 2022-06-09 18:27:02.969197078 +0200
++++ ./tools/ocaml/libs/xc/xenctrl_stubs.c      2022-06-09 18:27:19.448183361 +0200
+@@ -43,7 +43,9 @@
+ #define _H(__h) ((xc_interface *)(__h))
+ #define _D(__d) ((uint32_t)Int_val(__d))
+ 
++#ifndef Val_none
+ #define Val_none (Val_int(0))
++#endif
+ 
+ #define string_of_option_array(array, index) \
+       ((Field(array, index) == Val_none) ? NULL : String_val(Field(Field(array, index), 0)))
Index: pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c
diff -u /dev/null pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c:1.1
--- /dev/null   Fri Jun 24 13:46:46 2022
+++ pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c    Fri Jun 24 13:46:46 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c,v 1.1 2022/06/24 13:46:46 bouyer Exp $
+
+Avoid xentoollog_stubs.c:57: error: "Some_val" redefined [-Werror]
+
+--- ./tools/ocaml/libs/xentoollog/xentoollog_stubs.c.orig      2022-01-31 10:42:09.000000000 +0100
++++ ./tools/ocaml/libs/xentoollog/xentoollog_stubs.c   2022-06-09 18:22:10.699889986 +0200
+@@ -53,8 +53,12 @@
+ #include "_xtl_levels.inc"
+ 
+ /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */
++#ifndef Val_none
+ #define Val_none Val_int(0)
++#endif
++#ifndef Some_val
+ #define Some_val(v) Field(v,0)
++#endif
+ 
+ static value Val_some(value v)
+ {
Index: pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_libs_xl_xenlight_stubs.c
diff -u /dev/null pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_libs_xl_xenlight_stubs.c:1.1
--- /dev/null   Fri Jun 24 13:46:46 2022
+++ pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_libs_xl_xenlight_stubs.c      Fri Jun 24 13:46:46 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-tools_ocaml_libs_xl_xenlight_stubs.c,v 1.1 2022/06/24 13:46:46 bouyer Exp $
+
+avoid xenlight_stubs.c:231: error: "Some_val" redefined [-Werror]
+
+--- ./tools/ocaml/libs/xl/xenlight_stubs.c.orig        2022-06-09 18:29:38.816998959 +0200
++++ ./tools/ocaml/libs/xl/xenlight_stubs.c     2022-06-09 18:30:07.080850306 +0200
+@@ -227,8 +227,12 @@
+ }
+ 
+ /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */
++#ifndef Val_none
+ #define Val_none Val_int(0)
++#endif
++#ifndef Some_val
+ #define Some_val(v) Field(v,0)
++#endif
+ 
+ static value Val_some(value v)
+ {