Thu Jun 9 17:11:27 2022 UTC ()
Avoid redefinition of Val_none and Some_val; fixes PR pkg/56873


(bouyer)
diff -r1.9 -r1.10 pkgsrc/sysutils/xentools415/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xc_xenctrl_stubs.c
diff -r0 -r1.1 pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c
diff -r0 -r1.1 pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xl_xenlight_stubs.c
cvs diff -r1.9 -r1.10 pkgsrc/sysutils/xentools415/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools415/distinfo 2022/05/30 09:09:33 1.9
+++ pkgsrc/sysutils/xentools415/distinfo 2022/06/09 17:11:27 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.9 2022/05/30 09:09:33 bouyer Exp $ 1$NetBSD: distinfo,v 1.10 2022/06/09 17:11:27 bouyer Exp $
2 2
3BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b 3BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b
4SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403 4SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403
5Size (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 3937560 bytes 5Size (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 3937560 bytes
6BLAKE2s (xen415/seabios-1.14.0.tar.gz) = c34103500436ad4726f15f2ed181205736143fc41af5c4b32a7055cd021edc1d 6BLAKE2s (xen415/seabios-1.14.0.tar.gz) = c34103500436ad4726f15f2ed181205736143fc41af5c4b32a7055cd021edc1d
7SHA512 (xen415/seabios-1.14.0.tar.gz) = f282175484c99488f4349ff4d3af9a74d96df3e8dcbe679fcea5b8b559f95f600756939d99d6e61dabace206d3d9ccefdc8fa2bc7709d34d6a0dc085d6c79238 7SHA512 (xen415/seabios-1.14.0.tar.gz) = f282175484c99488f4349ff4d3af9a74d96df3e8dcbe679fcea5b8b559f95f600756939d99d6e61dabace206d3d9ccefdc8fa2bc7709d34d6a0dc085d6c79238
8Size (xen415/seabios-1.14.0.tar.gz) = 628981 bytes 8Size (xen415/seabios-1.14.0.tar.gz) = 628981 bytes
9BLAKE2s (xen415/xen-4.15.2.tar.gz) = f6e3d354a144c9ff49a198ebcafbd5e8a4414690d5672b3e2ed394c461ab8ab0 9BLAKE2s (xen415/xen-4.15.2.tar.gz) = f6e3d354a144c9ff49a198ebcafbd5e8a4414690d5672b3e2ed394c461ab8ab0
10SHA512 (xen415/xen-4.15.2.tar.gz) = 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54 10SHA512 (xen415/xen-4.15.2.tar.gz) = 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
11Size (xen415/xen-4.15.2.tar.gz) = 40773378 bytes 11Size (xen415/xen-4.15.2.tar.gz) = 40773378 bytes
12SHA1 (patch-.._seabios-rel-1.14.0_src_string.c) = 87e2e28fe47c196e74fea073c7e7f7d03990fbe3 12SHA1 (patch-.._seabios-rel-1.14.0_src_string.c) = 87e2e28fe47c196e74fea073c7e7f7d03990fbe3
13SHA1 (patch-Config.mk) = d108a1743b5b5313d3ea957b02a005b49f5b3bf6 13SHA1 (patch-Config.mk) = d108a1743b5b5313d3ea957b02a005b49f5b3bf6
14SHA1 (patch-Makefile) = 6c580cbea532d08a38cf5e54228bd0210a98da21 14SHA1 (patch-Makefile) = 6c580cbea532d08a38cf5e54228bd0210a98da21
@@ -29,26 +29,29 @@ SHA1 (patch-tools_hotplug_common_Makefil @@ -29,26 +29,29 @@ SHA1 (patch-tools_hotplug_common_Makefil
29SHA1 (patch-tools_include_xen-sys_NetBSD_evtchn.h) = cac834bdddfab8bb76be3b4766f084f6fc2a7bc2 29SHA1 (patch-tools_include_xen-sys_NetBSD_evtchn.h) = cac834bdddfab8bb76be3b4766f084f6fc2a7bc2
30SHA1 (patch-tools_include_xen-sys_NetBSD_privcmd.h) = b47ef90b0e823b270c491b9206ae10b9f230971d 30SHA1 (patch-tools_include_xen-sys_NetBSD_privcmd.h) = b47ef90b0e823b270c491b9206ae10b9f230971d
31SHA1 (patch-tools_libs_ctrl_Makefile) = e377e34e6f719b7433888eee94dba2ec264120bf 31SHA1 (patch-tools_libs_ctrl_Makefile) = e377e34e6f719b7433888eee94dba2ec264120bf
32SHA1 (patch-tools_libs_libs.mk) = 29b0faa8293d3579d67205505ea251edff1bd688 32SHA1 (patch-tools_libs_libs.mk) = 29b0faa8293d3579d67205505ea251edff1bd688
33SHA1 (patch-tools_libs_light_libxl.c) = 354079709784ea8534929e65c61c3dcf54f2cce9 33SHA1 (patch-tools_libs_light_libxl.c) = 354079709784ea8534929e65c61c3dcf54f2cce9
34SHA1 (patch-tools_libs_light_libxl_pci.c) = 6a88ebe073f7abed25a3763fc039084239a7c29c 34SHA1 (patch-tools_libs_light_libxl_pci.c) = 6a88ebe073f7abed25a3763fc039084239a7c29c
35SHA1 (patch-tools_libs_util_libxlu_pci.c) = 60af75fe9356b91c63ecc82bf1be00d17a9e8989 35SHA1 (patch-tools_libs_util_libxlu_pci.c) = 60af75fe9356b91c63ecc82bf1be00d17a9e8989
36SHA1 (patch-tools_libs_xenstore_xenstored_control.c) = 3ddd7db4e11573bb749f9317022e778f491e44a0 36SHA1 (patch-tools_libs_xenstore_xenstored_control.c) = 3ddd7db4e11573bb749f9317022e778f491e44a0
37SHA1 (patch-tools_libxl_libxl_dom.c) = 4aa62de9adbc1eb659ba22d03e3fed42619e5a21 37SHA1 (patch-tools_libxl_libxl_dom.c) = 4aa62de9adbc1eb659ba22d03e3fed42619e5a21
38SHA1 (patch-tools_libxl_libxl_event.c) = 9446c88d01b419cc7531b6f6d959816410e74024 38SHA1 (patch-tools_libxl_libxl_event.c) = 9446c88d01b419cc7531b6f6d959816410e74024
39SHA1 (patch-tools_libxl_libxl_internal.h) = abcfaec70521b3ada6b4eae743119c24f141ea8f 39SHA1 (patch-tools_libxl_libxl_internal.h) = abcfaec70521b3ada6b4eae743119c24f141ea8f
40SHA1 (patch-tools_misc_xenhypfs.c) = 2e5919e33f8027777a84bfc380071e54c8e7b807 40SHA1 (patch-tools_misc_xenhypfs.c) = 2e5919e33f8027777a84bfc380071e54c8e7b807
41SHA1 (patch-tools_ocaml_common.make) = 305994b93fe29fb42e4aa57e19a039abef4e76fe 41SHA1 (patch-tools_ocaml_common.make) = 305994b93fe29fb42e4aa57e19a039abef4e76fe
 42SHA1 (patch-tools_ocaml_libs_xc_xenctrl_stubs.c) = 9eb780bc22c918e3d864192ffad9a382e98542e4
 43SHA1 (patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c) = 5be34a9150d8bc9874f7ebbc28ea58c5633771eb
 44SHA1 (patch-tools_ocaml_libs_xl_xenlight_stubs.c) = efedd31bca5a20e981c5d5ada96d02c3001f3abb
42SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5 45SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5
43SHA1 (patch-tools_ocaml_xenstored_utils.ml) = dcb2a0a90cc74b10d71fe01b8ca48c08a7dd4715 46SHA1 (patch-tools_ocaml_xenstored_utils.ml) = dcb2a0a90cc74b10d71fe01b8ca48c08a7dd4715
44SHA1 (patch-tools_pygrub_Makefile) = 8149759d17e1d22fbf182e18617b8aa7f0e830fc 47SHA1 (patch-tools_pygrub_Makefile) = 8149759d17e1d22fbf182e18617b8aa7f0e830fc
45SHA1 (patch-tools_python_Makefile) = 92706e044b1933d6699aab5e4fa89e53b83f23dd 48SHA1 (patch-tools_python_Makefile) = 92706e044b1933d6699aab5e4fa89e53b83f23dd
46SHA1 (patch-tools_qemu-xen-traditional_Makefile) = 5fbb55bf84f9856043be301d5d06530190fe9a60 49SHA1 (patch-tools_qemu-xen-traditional_Makefile) = 5fbb55bf84f9856043be301d5d06530190fe9a60
47SHA1 (patch-tools_qemu-xen-traditional_block-raw-posix.c) = eb3efea4b0c7fd744f627f1926fca737ba826b99 50SHA1 (patch-tools_qemu-xen-traditional_block-raw-posix.c) = eb3efea4b0c7fd744f627f1926fca737ba826b99
48SHA1 (patch-tools_qemu-xen-traditional_configure) = 6a42dcac010f90439a347c0f6e886b07185cb19a 51SHA1 (patch-tools_qemu-xen-traditional_configure) = 6a42dcac010f90439a347c0f6e886b07185cb19a
49SHA1 (patch-tools_qemu-xen-traditional_hw_e1000.c) = ec86584529cc743ea27768ad1fab523ee9fb6bea 52SHA1 (patch-tools_qemu-xen-traditional_hw_e1000.c) = ec86584529cc743ea27768ad1fab523ee9fb6bea
50SHA1 (patch-tools_qemu-xen-traditional_hw_ide.c) = b541546390c6d142bc6079dbd51cfd65b5223e9e 53SHA1 (patch-tools_qemu-xen-traditional_hw_ide.c) = b541546390c6d142bc6079dbd51cfd65b5223e9e
51SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.c) = 45848fb5038bdd6def218b35dd0a6496a14102f1 54SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.c) = 45848fb5038bdd6def218b35dd0a6496a14102f1
52SHA1 (patch-tools_qemu-xen-traditional_hw_pt-graphics.c) = b9c18042f40ccacb3f24ab0f1e3c6e1a5bf5521a 55SHA1 (patch-tools_qemu-xen-traditional_hw_pt-graphics.c) = b9c18042f40ccacb3f24ab0f1e3c6e1a5bf5521a
53SHA1 (patch-tools_qemu-xen-traditional_hw_pt-msi.c) = a953380dbc3e64528c39e26d2c45c0cbd3e4d738 56SHA1 (patch-tools_qemu-xen-traditional_hw_pt-msi.c) = a953380dbc3e64528c39e26d2c45c0cbd3e4d738
54SHA1 (patch-tools_qemu-xen-traditional_hw_pt-msi.h) = 787447cc24518fe5ae16942d72d3038db612419d 57SHA1 (patch-tools_qemu-xen-traditional_hw_pt-msi.h) = 787447cc24518fe5ae16942d72d3038db612419d
File Added: pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xc_xenctrl_stubs.c
$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)))
File Added: pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xentoollog_xentoollog_stubs.c
$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)
 {
File Added: pkgsrc/sysutils/xentools415/patches/patch-tools_ocaml_libs_xl_xenlight_stubs.c
$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)
 {