CVS commit: pkgsrc/sysutils/xentools46

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

Module Name:    pkgsrc
Committed By:   abs
Date:           Sat Jan 27 18:24:16 UTC 2018

Modified Files:
        pkgsrc/sysutils/xentools46: Makefile distinfo
        pkgsrc/sysutils/xentools46/patches: patch-ocaml_common.make

Log Message:
Add -unsafe-string to fix build with ocaml-4.06.0 and later. ++PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/xentools46/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/xentools46/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/xentools46/patches/patch-ocaml_common.make

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/xentools46/Makefile
diff -u pkgsrc/sysutils/xentools46/Makefile:1.27 pkgsrc/sysutils/xentools46/Makefile:1.28
--- pkgsrc/sysutils/xentools46/Makefile:1.27    Mon Jan 15 09:47:55 2018
+++ pkgsrc/sysutils/xentools46/Makefile Sat Jan 27 18:24:16 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2018/01/15 09:47:55 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2018/01/27 18:24:16 abs Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 .include               "version.mk"
 
 DISTNAME=              xen-${VERSION}
 PKGNAME=               xentools46-${VERSION}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            sysutils
 MASTER_SITES=          https://downloads.xenproject.org/release/xen/${VERSION}/
 

Index: pkgsrc/sysutils/xentools46/distinfo
diff -u pkgsrc/sysutils/xentools46/distinfo:1.10 pkgsrc/sysutils/xentools46/distinfo:1.11
--- pkgsrc/sysutils/xentools46/distinfo:1.10    Sat Oct 28 03:14:17 2017
+++ pkgsrc/sysutils/xentools46/distinfo Sat Jan 27 18:24:16 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2017/10/28 03:14:17 khorben Exp $
+$NetBSD: distinfo,v 1.11 2018/01/27 18:24:16 abs Exp $
 
 SHA1 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = fecadf952821e830ce1a1d19655288eef8488f88
 RMD160 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 539bfa12db7054228250d6dd380bbf96c1a040f8
@@ -47,7 +47,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) = df631c2da394b6e021934d2508e9d9fb497c3d41
+SHA1 (patch-ocaml_common.make) = 9be67ac373f21688d7d8ff92430b1185305d728a
 SHA1 (patch-ocaml_xenstored_Makefile) = 237e26d3ec25d706e16b415f90e0fcc4913e02e5
 SHA1 (patch-ocaml_xenstored_define.ml) = 18d6878ae536554e8831f3732d2a8ea1b13a9b63
 SHA1 (patch-ocaml_xenstored_utils.ml) = 04997cb9189a3331522c344aa1957e61febfd4d2

Index: pkgsrc/sysutils/xentools46/patches/patch-ocaml_common.make
diff -u pkgsrc/sysutils/xentools46/patches/patch-ocaml_common.make:1.2 pkgsrc/sysutils/xentools46/patches/patch-ocaml_common.make:1.3
--- pkgsrc/sysutils/xentools46/patches/patch-ocaml_common.make:1.2      Wed Aug 23 02:38:38 2017
+++ pkgsrc/sysutils/xentools46/patches/patch-ocaml_common.make  Sat Jan 27 18:24:16 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-ocaml_common.make,v 1.2 2017/08/23 02:38:38 maya Exp $
+$NetBSD: patch-ocaml_common.make,v 1.3 2018/01/27 18:24:16 abs Exp $
 
-Handle ocaml-findlib already appending DESTDIR
+Add -unsafe-string to fix build with ocaml-4.06.0 and later
 
---- 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-07-06 07:04:28.000000000 +0000
++++ ocaml/common.make
+@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
  CC ?= gcc
  OCAMLOPT ?= ocamlopt
  OCAMLC ?= ocamlc
@@ -13,12 +13,18 @@ Handle ocaml-findlib already appending D
  OCAMLDEP ?= ocamldep
  OCAMLLEX ?= ocamllex
  OCAMLYACC ?= ocamlyacc
-@@ -17,6 +17,6 @@ OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -
-
+@@ -12,11 +12,11 @@ OCAMLFIND ?= ocamlfind
+ CFLAGS += -fPIC -Werror -I$(shell ocamlc -where)
+ 
+ OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^  *\(-g\) .*/\1/p')
+-OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F
+-OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F
++OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -unsafe-string -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F
++OCAMLCFLAGS += -unsafe-string -g $(OCAMLINCLUDE) -w F -warn-error F
+ 
  VERSION := 4.1
-
+ 
 -OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir)
 +OCAMLDESTDIR ?= $(shell $(OCAMLFIND) printconf destdir)
-
+ 
  o= >$@.new && mv -f $@.new $@
-