Re: sysutils/xenkernel4[68] build errors on NetBSD 7

[David Brownlee <abs%absd.org@localhost>]

On 17 July 2017 at 12:58, Gary Duzan <gary%duzan.org@localhost> wrote:
>
>   The patch I used to get xentools46 working is included below.
> I suspect similar changes would work for xentools48.
>
>                                 Gary Duzan
>
> Index: Makefile
> ===================================================================
> RCS file: /usr/netbsd-cvs/pkgsrc/sysutils/xentools46/Makefile,v
> retrieving revision 1.17
> diff -b -u -p -r1.17 Makefile
> --- Makefile    11 Jul 2017 14:19:21 -0000      1.17
> +++ Makefile    17 Jul 2017 11:54:34 -0000
> @@ -61,6 +61,8 @@ MAKE_ENV+=            NO_WERROR=1
>  #MAKE_ENV+=            INSTALL_DATA=${BSD_INSTALL_DATA}
>  #MAKE_ENV+=            INSTALL_PROG=${BSD_INSTALL_PROGRAM}
>
> +PKGSRC_USE_SSP=                no
> +
>  PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36
>
>  PY_PATCHPLIST=         yes
> Index: distinfo
> ===================================================================
> RCS file: /usr/netbsd-cvs/pkgsrc/sysutils/xentools46/distinfo,v
> retrieving revision 1.7
> diff -b -u -p -r1.7 distinfo
> --- distinfo    21 Mar 2017 22:52:52 -0000      1.7
> +++ distinfo    17 Jul 2017 11:54:34 -0000
> @@ -45,7 +45,7 @@ SHA1 (patch-libxl_libxl_internal.h) = 73
>  SHA1 (patch-libxl_libxl_uuid.c) = d14286be8ccdbcb5fae544a1968e7b681b63e884
>  SHA1 (patch-libxl_xl__cmdtable.c) = d149603cac13c996d7800cee94a9df3aaadf9625
>  SHA1 (patch-libxl_xl_cmdimpl.c) = 7aea48a9761b39cf620dcad2295a257c5fc53c8c
> -SHA1 (patch-ocaml_common.make) = 4d4bddca7b5d93489a3f6620af51d95bbe265abb
> +SHA1 (patch-ocaml_common.make) = 3e0128846f89fb7b62d06b5eebcd01181c739c73
>  SHA1 (patch-ocaml_xenstored_Makefile) = 237e26d3ec25d706e16b415f90e0fcc4913e02e5
>  SHA1 (patch-ocaml_xenstored_define.ml) = 18d6878ae536554e8831f3732d2a8ea1b13a9b63
>  SHA1 (patch-ocaml_xenstored_utils.ml) = 04997cb9189a3331522c344aa1957e61febfd4d2
> Index: patches/patch-ocaml_common.make
> ===================================================================
> RCS file: /usr/netbsd-cvs/pkgsrc/sysutils/xentools46/patches/patch-ocaml_common.make,v
> retrieving revision 1.1.1.1
> diff -b -u -p -r1.1.1.1 patch-ocaml_common.make
> --- patches/patch-ocaml_common.make     4 Jul 2016 07:30:52 -0000       1.1.1.1
> +++ patches/patch-ocaml_common.make     17 Jul 2017 11:54:34 -0000
> @@ -1,8 +1,8 @@
>  $NetBSD: patch-ocaml_common.make,v 1.1.1.1 2016/07/04 07:30:52 jnemeth Exp $
>
> ---- ocaml/common.make.orig     2015-01-12 17:53:24.000000000 +0100
> -+++ ocaml/common.make  2015-01-19 13:16:38.000000000 +0100
> -@@ -3,7 +3,7 @@
> +--- ocaml/common.make.orig     2017-03-07 16:19:05.000000000 +0000
> ++++ ocaml/common.make
> +@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
>   CC ?= gcc
>   OCAMLOPT ?= ocamlopt
>   OCAMLC ?= ocamlc
> @@ -11,3 +11,11 @@ $NetBSD: patch-ocaml_common.make,v 1.1.1
>   OCAMLDEP ?= ocamldep
>   OCAMLLEX ?= ocamllex
>   OCAMLYACC ?= ocamlyacc
> +@@ -17,6 +17,6 @@ OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -
> +
> + VERSION := 4.1
> +
> +-OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir)
> ++OCAMLDESTDIR ?= $(shell $(OCAMLFIND) printconf destdir)
> +
> + o= >$@.new && mv -f $@.new $@

Just to say thanks for this - it fixed my xentools48 build under
netbsd-8/amd64 :)