CVS commit: pkgsrc/sysutils/xentools45

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

Module Name:    pkgsrc
Committed By:   abs
Date:           Sat Jan 27 19:11:41 UTC 2018

Modified Files:
        pkgsrc/sysutils/xentools45: Makefile distinfo
        pkgsrc/sysutils/xentools45/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.55 -r1.56 pkgsrc/sysutils/xentools45/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/xentools45/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/xentools45/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/xentools45/Makefile
diff -u pkgsrc/sysutils/xentools45/Makefile:1.55 pkgsrc/sysutils/xentools45/Makefile:1.56
--- pkgsrc/sysutils/xentools45/Makefile:1.55    Mon Jan 15 09:47:54 2018
+++ pkgsrc/sysutils/xentools45/Makefile Sat Jan 27 19:11:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2018/01/15 09:47:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.56 2018/01/27 19:11:41 abs Exp $
 
 VERSION=       4.5.5
-PKGREVISION=   8
+PKGREVISION=   9
 VERSION_IPXE=  9a93db3f0947484e30e753bbd61a10b17336e20e
 
 DISTNAME=              xen-${VERSION}

Index: pkgsrc/sysutils/xentools45/distinfo
diff -u pkgsrc/sysutils/xentools45/distinfo:1.32 pkgsrc/sysutils/xentools45/distinfo:1.33
--- pkgsrc/sysutils/xentools45/distinfo:1.32    Sat Oct 28 03:14:17 2017
+++ pkgsrc/sysutils/xentools45/distinfo Sat Jan 27 19:11:41 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2017/10/28 03:14:17 khorben Exp $
+$NetBSD: distinfo,v 1.33 2018/01/27 19:11:41 abs Exp $
 
 SHA1 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = fecadf952821e830ce1a1d19655288eef8488f88
 RMD160 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 539bfa12db7054228250d6dd380bbf96c1a040f8
@@ -53,7 +53,7 @@ SHA1 (patch-libxl_libxl__create.c) = d4c
 SHA1 (patch-libxl_libxl__save__helper.c) = 70e5237e28bea1aa87486e080fc25aa81300a6d8
 SHA1 (patch-libxl_libxl_uuid.c) = d14286be8ccdbcb5fae544a1968e7b681b63e884
 SHA1 (patch-libxl_xl__cmdtable.c) = d149603cac13c996d7800cee94a9df3aaadf9625
-SHA1 (patch-ocaml_common.make) = 4c8fd60da404522ce0dadf18d3d59996e7a2992e
+SHA1 (patch-ocaml_common.make) = e92458b7e0e84b1696f9a3b72d324515fdd75abc
 SHA1 (patch-ocaml_libs_xb_xs__ring__stubs.c) = e079d5f3995ea44035c0c65610d15fb65af8571d
 SHA1 (patch-ocaml_xenstored_Makefile) = 8014db42b65ca9290013069d1f3cb816e3f023c2
 SHA1 (patch-ocaml_xenstored_define.ml) = 18d6878ae536554e8831f3732d2a8ea1b13a9b63

Index: pkgsrc/sysutils/xentools45/patches/patch-ocaml_common.make
diff -u pkgsrc/sysutils/xentools45/patches/patch-ocaml_common.make:1.2 pkgsrc/sysutils/xentools45/patches/patch-ocaml_common.make:1.3
--- pkgsrc/sysutils/xentools45/patches/patch-ocaml_common.make:1.2      Wed Aug 23 02:49:48 2017
+++ pkgsrc/sysutils/xentools45/patches/patch-ocaml_common.make  Sat Jan 27 19:11:41 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-ocaml_common.make,v 1.2 2017/08/23 02:49:48 maya Exp $
+$NetBSD: patch-ocaml_common.make,v 1.3 2018/01/27 19:11:41 abs Exp $
 
 Handle ocaml-findlib 1.7.3 already appending DESTDIR
+Add -unsafe-string to fix build with ocaml-4.06.0 and later. ++PKGREVISION
 
---- ocaml/common.make.orig     2015-01-12 17:53:24.000000000 +0100
-+++ ocaml/common.make  2015-01-19 13:16:38.000000000 +0100
-++ work/xen-4.5.5/tools/ocaml/common.make
+--- ocaml/common.make.orig     2016-09-20 05:59:24.000000000 +0000
++++ ocaml/common.make
 @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
  CC ?= gcc
  OCAMLOPT ?= ocamlopt
@@ -14,7 +14,14 @@ Handle ocaml-findlib 1.7.3 already appen
  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