pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/xentools48 xentools48: fix PR pkg/54915
details: https://anonhg.NetBSD.org/pkgsrc/rev/68ed0803a608
branches: trunk
changeset: 411002:68ed0803a608
user: triaxx <triaxx%pkgsrc.org@localhost>
date: Mon Feb 03 05:56:50 2020 +0000
description:
xentools48: fix PR pkg/54915
pkgsrc changes:
---------------
* Add patches to fix build with new OCaml provided for xentools411
https://mail-index.netbsd.org/pkgsrc-changes/2020/01/18/msg205125.html
diffstat:
sysutils/xentools48/Makefile | 4 +-
sysutils/xentools48/distinfo | 4 +-
sysutils/xentools48/patches/patch-tools_ocaml_libs_xentoollog_xentoollog__stubs.c | 25 ++
sysutils/xentools48/patches/patch-tools_ocaml_libs_xl_xenlight__stubs.c | 97 ++++++++++
4 files changed, 127 insertions(+), 3 deletions(-)
diffs (166 lines):
diff -r cf8a4c7d447b -r 68ed0803a608 sysutils/xentools48/Makefile
--- a/sysutils/xentools48/Makefile Mon Feb 03 04:51:32 2020 +0000
+++ b/sysutils/xentools48/Makefile Mon Feb 03 05:56:50 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/11/04 21:28:59 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2020/02/03 05:56:50 triaxx Exp $
#
VERSION= 4.8.5
VERSION_IPXE= 827dd1bfee67daa683935ce65316f7e0f057fe1c
@@ -19,7 +19,7 @@
CATEGORIES= sysutils
MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/
-#PKGREVISION= 0
+PKGREVISION= 1
DISTFILES= ${DISTNAME}.tar.gz
diff -r cf8a4c7d447b -r 68ed0803a608 sysutils/xentools48/distinfo
--- a/sysutils/xentools48/distinfo Mon Feb 03 04:51:32 2020 +0000
+++ b/sysutils/xentools48/distinfo Mon Feb 03 05:56:50 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2019/08/30 13:23:10 bouyer Exp $
+$NetBSD: distinfo,v 1.13 2020/02/03 05:56:50 triaxx Exp $
SHA1 (xen48/gmp-4.3.2.tar.bz2) = c011e8feaf1bb89158bd55eaabd7ef8fdd101a2c
RMD160 (xen48/gmp-4.3.2.tar.bz2) = a8f3f41501ece290c348aeb4444bbea40bc53e71
@@ -98,6 +98,8 @@
SHA1 (patch-tools_libxl_xl__cmdtable.c) = 073c08795af8ec828c60864a788c32e9cca31547
SHA1 (patch-tools_libxl_xl_cmdimpl.c) = d43beffad3c6da70cb69b2b5d3cf0b48f614e2a6
SHA1 (patch-tools_ocaml_common.make) = 4b845bdf3a013852109749ee18dfe28e3440d951
+SHA1 (patch-tools_ocaml_libs_xentoollog_xentoollog__stubs.c) = a02cd05a12db6adadd945d403cba2653c0647201
+SHA1 (patch-tools_ocaml_libs_xl_xenlight__stubs.c) = 769396ff1fb18272a0bf2bb433f999e9a887c5f0
SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5
SHA1 (patch-tools_ocaml_xenstored_define.ml) = 1f12a8a853b847b80e2c3bb5919ed2410a70092f
SHA1 (patch-tools_ocaml_xenstored_utils.ml) = 560b26b6d5030838721ddb4e3d819766c3db0349
diff -r cf8a4c7d447b -r 68ed0803a608 sysutils/xentools48/patches/patch-tools_ocaml_libs_xentoollog_xentoollog__stubs.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools48/patches/patch-tools_ocaml_libs_xentoollog_xentoollog__stubs.c Mon Feb 03 05:56:50 2020 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-tools_ocaml_libs_xentoollog_xentoollog__stubs.c,v 1.1 2020/02/03 05:56:50 triaxx Exp $
+
+Fix build with newer ocaml
+c.f. https://github.com/ocaml/ocaml/pull/2293
+
+--- tools/ocaml/libs/xentoollog/xentoollog_stubs.c.orig 2018-12-03 09:03:57.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 cf8a4c7d447b -r 68ed0803a608 sysutils/xentools48/patches/patch-tools_ocaml_libs_xl_xenlight__stubs.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools48/patches/patch-tools_ocaml_libs_xl_xenlight__stubs.c Mon Feb 03 05:56:50 2020 +0000
@@ -0,0 +1,97 @@
+$NetBSD: patch-tools_ocaml_libs_xl_xenlight__stubs.c,v 1.1 2020/02/03 05:56:50 triaxx Exp $
+
+Fix build with newer ocaml
+c.f. https://github.com/ocaml/ocaml/pull/2293
+
+--- tools/ocaml/libs/xl/xenlight_stubs.c.orig 2018-12-03 09:03:57.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) {
+@@ -1120,7 +1120,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)
+@@ -1261,7 +1261,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;
+
+@@ -1304,7 +1304,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;
+
+@@ -1343,7 +1343,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;
+
+@@ -1385,7 +1385,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;
+
+@@ -1437,7 +1437,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;
+
+@@ -1553,7 +1553,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 */
+@@ -1576,7 +1576,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 */
Home |
Main Index |
Thread Index |
Old Index