CVS commit: pkgsrc/sysutils/xentools415

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

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Thu Jun  9 17:11:27 UTC 2022

Modified Files:
        pkgsrc/sysutils/xentools415: distinfo
Added Files:
        pkgsrc/sysutils/xentools415/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:
Avoid redefinition of Val_none and Some_val; fixes PR pkg/56873


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/xentools415/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xc_xenctrl_stubs.c \
    pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c \
    pkgsrc/sysutils/xentools415/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/xentools415/distinfo
diff -u pkgsrc/sysutils/xentools415/distinfo:1.9 pkgsrc/sysutils/xentools415/distinfo:1.10
--- pkgsrc/sysutils/xentools415/distinfo:1.9    Mon May 30 09:09:33 2022
+++ pkgsrc/sysutils/xentools415/distinfo        Thu Jun  9 17:11:27 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2022/05/30 09:09:33 bouyer Exp $
+$NetBSD: distinfo,v 1.10 2022/06/09 17:11:27 bouyer Exp $
 
 BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b
 SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403
@@ -39,6 +39,9 @@ SHA1 (patch-tools_libxl_libxl_event.c) =
 SHA1 (patch-tools_libxl_libxl_internal.h) = abcfaec70521b3ada6b4eae743119c24f141ea8f
 SHA1 (patch-tools_misc_xenhypfs.c) = 2e5919e33f8027777a84bfc380071e54c8e7b807
 SHA1 (patch-tools_ocaml_common.make) = 305994b93fe29fb42e4aa57e19a039abef4e76fe
+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) = dcb2a0a90cc74b10d71fe01b8ca48c08a7dd4715
 SHA1 (patch-tools_pygrub_Makefile) = 8149759d17e1d22fbf182e18617b8aa7f0e830fc

Added files:

Index: pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xc_xenctrl_stubs.c
diff -u /dev/null pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xc_xenctrl_stubs.c:1.1
--- /dev/null   Thu Jun  9 17:11:27 2022
+++ pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xc_xenctrl_stubs.c       Thu Jun  9 17:11:27 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-tools_ocaml_libs_xc_xenctrl_stubs.c,v 1.1 2022/06/09 17:11:27 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/xentools415/patches/patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c
diff -u /dev/null pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c:1.1
--- /dev/null   Thu Jun  9 17:11:27 2022
+++ pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c    Thu Jun  9 17:11:27 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c,v 1.1 2022/06/09 17:11:27 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/xentools415/patches/patch-tools_ocaml_libs_xl_xenlight_stubs.c
diff -u /dev/null pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xl_xenlight_stubs.c:1.1
--- /dev/null   Thu Jun  9 17:11:27 2022
+++ pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xl_xenlight_stubs.c      Thu Jun  9 17:11:27 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-tools_ocaml_libs_xl_xenlight_stubs.c,v 1.1 2022/06/09 17:11:27 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)
+ {