diff --git a/srcpkgs/xen/patches/ocaml-4.12.patch b/srcpkgs/xen/patches/ocaml-4.12.patch new file mode 100644 index 00000000000..32ec8657e3b --- /dev/null +++ b/srcpkgs/xen/patches/ocaml-4.12.patch @@ -0,0 +1,36 @@ +2021-04-06 - Anton Farygin 4.14.1-alt2 +- fixed build with ocaml-4.12.0 + +--- xen-4.14.1/tools/ocaml/libs/xentoollog/xentoollog_stubs.c.orig 2020-12-17 16:47:25.000000000 +0000 ++++ xen-4.14.1/tools/ocaml/libs/xentoollog/xentoollog_stubs.c 2021-03-01 22:53:23.106205483 +0000 +@@ -53,8 +53,6 @@ + #include "_xtl_levels.inc" + + /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */ +-#define Val_none Val_int(0) +-#define Some_val(v) Field(v,0) + + static value Val_some(value v) + { +--- xen-4.14.1/tools/ocaml/libs/xl/xenlight_stubs.c.orig 2020-12-17 16:47:25.000000000 +0000 ++++ xen-4.14.1/tools/ocaml/libs/xl/xenlight_stubs.c 2021-03-01 23:01:24.229859714 +0000 +@@ -227,8 +227,6 @@ + } + + /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */ +-#define Val_none Val_int(0) +-#define Some_val(v) Field(v,0) + + static value Val_some(value v) + { +--- xen-4.14.1/tools/ocaml/libs/xc/xenctrl_stubs.c.orig 2020-12-17 16:47:25.000000000 +0000 ++++ xen-4.14.1/tools/ocaml/libs/xc/xenctrl_stubs.c 2021-03-01 23:24:45.477290290 +0000 +@@ -43,8 +43,6 @@ + #define _H(__h) ((xc_interface *)(__h)) + #define _D(__d) ((uint32_t)Int_val(__d)) + +-#define Val_none (Val_int(0)) +- + #define string_of_option_array(array, index) \ + ((Field(array, index) == Val_none) ? NULL : String_val(Field(Field(array, index), 0))) + diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index d916f29ac38..930296532e9 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -1,7 +1,7 @@ # Template file for 'xen' pkgname=xen version=4.14.1 -revision=2 +revision=3 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63 # TODO: arm / aarch64 @@ -14,7 +14,8 @@ hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript gi ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget" makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel - netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel" + netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel + ncurses-devel" depends="bridge-utils perl xen-hypervisor" short_desc="Xen hypervisor utilities" maintainer="Chris Brannon "