[pkgsrc/trunk]: pkgsrc/sysutils/xentools411 Fix build with new ocaml

[prlw1 <prlw1%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20fd5238d7ec
branches:  trunk
changeset: 409533:20fd5238d7ec
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Sat Jan 18 21:58:44 2020 +0000

description:
Fix build with new ocaml

diffstat:

 sysutils/xentools411/distinfo                                                      |   4 +-
 sysutils/xentools411/patches/patch-tools_ocaml_libs_xentoollog_xentoollog__stubs.c |  25 ++
 sysutils/xentools411/patches/patch-tools_ocaml_libs_xl__xenlight_stubs.c           |  97 ++++++++++
 3 files changed, 125 insertions(+), 1 deletions(-)

diffs (148 lines):

diff -r b7d9a8961e00 -r 20fd5238d7ec sysutils/xentools411/distinfo
--- a/sysutils/xentools411/distinfo     Sat Jan 18 21:58:15 2020 +0000
+++ b/sysutils/xentools411/distinfo     Sat Jan 18 21:58:44 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2019/12/18 13:37:39 bouyer Exp $
+$NetBSD: distinfo,v 1.10 2020/01/18 21:58:44 prlw1 Exp $
 
 SHA1 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = 272b8c904dc0127690eca2c5c20c67479e40da34
 RMD160 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = cfcb4a314c15da19b36132b27126f3bd9699d0e5
@@ -52,6 +52,8 @@
 SHA1 (patch-tools_libxl_libxl_internal.h) = 613edc0fa055b23f5dc2a2448456d3d6005337fe
 SHA1 (patch-tools_libxl_libxl_uuid.c) = 1eb8c027dbeb7e67df7475ee6e4d87220140c65b
 SHA1 (patch-tools_ocaml_common.make) = 4b845bdf3a013852109749ee18dfe28e3440d951
+SHA1 (patch-tools_ocaml_libs_xentoollog_xentoollog__stubs.c) = adee03d87168e735cb0d42ce06d0c31a14315b8d
+SHA1 (patch-tools_ocaml_libs_xl__xenlight_stubs.c) = cc612908524670f650a294af133a5912f955f39e
 SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5
 SHA1 (patch-tools_ocaml_xenstored_utils.ml) = fd951de732d6c31cae89bd4b58c5650108578d79
 SHA1 (patch-tools_qemu-xen-traditional_Makefile) = 5fbb55bf84f9856043be301d5d06530190fe9a60
diff -r b7d9a8961e00 -r 20fd5238d7ec sysutils/xentools411/patches/patch-tools_ocaml_libs_xentoollog_xentoollog__stubs.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools411/patches/patch-tools_ocaml_libs_xentoollog_xentoollog__stubs.c        Sat Jan 18 21:58:44 2020 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-tools_ocaml_libs_xentoollog_xentoollog__stubs.c,v 1.1 2020/01/18 21:58:44 prlw1 Exp $
+
+Fix build with newer ocaml
+c.f. https://github.com/ocaml/ocaml/pull/2293
+
+--- tools/ocaml/libs/xentoollog/xentoollog_stubs.c.orig        2019-11-29 09:15:18.000000000 +0000
++++ tools/ocaml/libs/xentoollog/xentoollog_stubs.c
+@@ -90,7 +90,7 @@ static void stub_xtl_ocaml_vmessage(stru
+       CAMLparam0();
+       CAMLlocalN(args, 4);
+       struct caml_xtl *xtl = (struct caml_xtl*)logger;
+-      value *func = caml_named_value(xtl->vmessage_cb) ;
++      const value *func = caml_named_value(xtl->vmessage_cb) ;
+       char *msg;
+ 
+       if (func == NULL)
+@@ -120,7 +120,7 @@ static void stub_xtl_ocaml_progress(stru
+       CAMLparam0();
+       CAMLlocalN(args, 5);
+       struct caml_xtl *xtl = (struct caml_xtl*)logger;
+-      value *func = caml_named_value(xtl->progress_cb) ;
++      const value *func = caml_named_value(xtl->progress_cb) ;
+ 
+       if (func == NULL)
+               caml_raise_sys_error(caml_copy_string("Unable to find callback"));
diff -r b7d9a8961e00 -r 20fd5238d7ec sysutils/xentools411/patches/patch-tools_ocaml_libs_xl__xenlight_stubs.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools411/patches/patch-tools_ocaml_libs_xl__xenlight_stubs.c  Sat Jan 18 21:58:44 2020 +0000
@@ -0,0 +1,97 @@
+$NetBSD: patch-tools_ocaml_libs_xl__xenlight_stubs.c,v 1.1 2020/01/18 21:58:44 prlw1 Exp $
+
+Fix build with newer ocaml
+c.f. https://github.com/ocaml/ocaml/pull/2293
+
+--- tools/ocaml/libs/xl/xenlight_stubs.c.orig  2019-11-29 09:15:18.000000000 +0000
++++ tools/ocaml/libs/xl/xenlight_stubs.c
+@@ -75,7 +75,7 @@ static void failwith_xl(int error, char 
+ {
+       CAMLparam0();
+       CAMLlocal1(arg);
+-      static value *exc = NULL;
++      static const value *exc = NULL;
+ 
+       /* First time around, lookup by name */
+       if (!exc)
+@@ -424,7 +424,7 @@ void async_callback(libxl_ctx *ctx, int 
+       caml_leave_blocking_section();
+       CAMLparam0();
+       CAMLlocal2(error, tmp);
+-      static value *func = NULL;
++      static const value *func = NULL;
+       value *p = (value *) for_callback;
+ 
+       if (func == NULL) {
+@@ -1118,7 +1118,7 @@ value stub_libxl_xen_console_read_start(
+ 
+ static void raise_eof(void)
+ {
+-      static value *exc = NULL;
++      static const value *exc = NULL;
+ 
+       /* First time around, lookup by name */
+       if (!exc)
+@@ -1259,7 +1259,7 @@ int fd_register(void *user, int fd, void
+       CAMLparam0();
+       CAMLlocalN(args, 4);
+       int ret = 0;
+-      static value *func = NULL;
++      static const value *func = NULL;
+       value *p = (value *) user;
+       value *for_app;
+ 
+@@ -1302,7 +1302,7 @@ int fd_modify(void *user, int fd, void *
+       CAMLparam0();
+       CAMLlocalN(args, 4);
+       int ret = 0;
+-      static value *func = NULL;
++      static const value *func = NULL;
+       value *p = (value *) user;
+       value *for_app = *for_app_registration_update;
+ 
+@@ -1341,7 +1341,7 @@ void fd_deregister(void *user, int fd, v
+       caml_leave_blocking_section();
+       CAMLparam0();
+       CAMLlocalN(args, 3);
+-      static value *func = NULL;
++      static const value *func = NULL;
+       value *p = (value *) user;
+       value *for_app = for_app_registration;
+ 
+@@ -1383,7 +1383,7 @@ int timeout_register(void *user, void **
+       CAMLlocal2(sec, usec);
+       CAMLlocalN(args, 4);
+       int ret = 0;
+-      static value *func = NULL;
++      static const value *func = NULL;
+       value *p = (value *) user;
+       struct timeout_handles *handles;
+ 
+@@ -1435,7 +1435,7 @@ int timeout_modify(void *user, void **fo
+       CAMLlocal1(for_app_update);
+       CAMLlocalN(args, 2);
+       int ret = 0;
+-      static value *func = NULL;
++      static const value *func = NULL;
+       value *p = (value *) user;
+       struct timeout_handles *handles = *for_app_registration_update;
+ 
+@@ -1551,7 +1551,7 @@ void event_occurs(void *user, libxl_even
+       CAMLparam0();
+       CAMLlocalN(args, 2);
+       struct user_with_ctx *c_user = (struct user_with_ctx *) user;
+-      static value *func = NULL;
++      static const value *func = NULL;
+ 
+       if (func == NULL) {
+               /* First time around, lookup by name */
+@@ -1574,7 +1574,7 @@ void disaster(void *user, libxl_event_ty
+       CAMLparam0();
+       CAMLlocalN(args, 4);
+       struct user_with_ctx *c_user = (struct user_with_ctx *) user;
+-      static value *func = NULL;
++      static const value *func = NULL;
+ 
+       if (func == NULL) {
+               /* First time around, lookup by name */