[pkgsrc/trunk]: pkgsrc/sysutils/xentools48 Add -unsafe-string to fix build wi...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e1eb3a80ea7d
branches:  trunk
changeset: 374679:e1eb3a80ea7d
user:      abs <abs%pkgsrc.org@localhost>
date:      Sat Jan 27 17:37:51 2018 +0000

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

diffstat:

 sysutils/xentools48/Makefile                              |   4 ++-
 sysutils/xentools48/distinfo                              |   4 +-
 sysutils/xentools48/patches/patch-tools_ocaml_common.make |  18 ++++++++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diffs (71 lines):

diff -r acd93718bf71 -r e1eb3a80ea7d sysutils/xentools48/Makefile
--- a/sysutils/xentools48/Makefile      Sat Jan 27 16:44:40 2018 +0000
+++ b/sysutils/xentools48/Makefile      Sat Jan 27 17:37:51 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/01/24 23:29:32 bouyer Exp $
+# $NetBSD: Makefile,v 1.17 2018/01/27 17:37:51 abs Exp $
 #
 VERSION=       4.8.3
 VERSION_IPXE=  827dd1bfee67daa683935ce65316f7e0f057fe1c
@@ -19,6 +19,8 @@
 CATEGORIES=            sysutils
 MASTER_SITES=          https://downloads.xenproject.org/release/xen/${VERSION}/
 
+PKGREVISION=           1
+
 DISTFILES=             ${DISTNAME}.tar.gz
 
 XEN_EXTFILES=          http://xenbits.xensource.com/xen-extfiles/
diff -r acd93718bf71 -r e1eb3a80ea7d sysutils/xentools48/distinfo
--- a/sysutils/xentools48/distinfo      Sat Jan 27 16:44:40 2018 +0000
+++ b/sysutils/xentools48/distinfo      Sat Jan 27 17:37:51 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2018/01/27 16:44:40 bouyer Exp $
+$NetBSD: distinfo,v 1.9 2018/01/27 17:37:51 abs Exp $
 
 SHA1 (xen48/gmp-4.3.2.tar.bz2) = c011e8feaf1bb89158bd55eaabd7ef8fdd101a2c
 RMD160 (xen48/gmp-4.3.2.tar.bz2) = a8f3f41501ece290c348aeb4444bbea40bc53e71
@@ -95,7 +95,7 @@
 SHA1 (patch-tools_libxl_libxl_uuid.c) = 1eb8c027dbeb7e67df7475ee6e4d87220140c65b
 SHA1 (patch-tools_libxl_xl__cmdtable.c) = 073c08795af8ec828c60864a788c32e9cca31547
 SHA1 (patch-tools_libxl_xl_cmdimpl.c) = d43beffad3c6da70cb69b2b5d3cf0b48f614e2a6
-SHA1 (patch-tools_ocaml_common.make) = 961b2e23777ef39dec3ecde0d281705f960f4020
+SHA1 (patch-tools_ocaml_common.make) = 4b845bdf3a013852109749ee18dfe28e3440d951
 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 acd93718bf71 -r e1eb3a80ea7d sysutils/xentools48/patches/patch-tools_ocaml_common.make
--- a/sysutils/xentools48/patches/patch-tools_ocaml_common.make Sat Jan 27 16:44:40 2018 +0000
+++ b/sysutils/xentools48/patches/patch-tools_ocaml_common.make Sat Jan 27 17:37:51 2018 +0000
@@ -1,10 +1,11 @@
-$NetBSD: patch-tools_ocaml_common.make,v 1.3 2017/08/23 03:02:14 maya Exp $
+$NetBSD: patch-tools_ocaml_common.make,v 1.4 2018/01/27 17:37:51 abs Exp $
 
 Handle ocaml-findlib 1.7.3 already appending destdir
+Add -unsafe-string to fix build with ocaml-4.06.0 and later
 
---- tools/ocaml/common.make.orig       2016-12-05 12:03:27.000000000 +0000
-+++ tools/ocaml/common.make    2017-08-18 16:00:39.195689939 +0100
-@@ -3,7 +3,7 @@
+--- tools/ocaml/common.make.orig       2018-01-23 13:49:58.000000000 +0000
++++ tools/ocaml/common.make
+@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
  CC ?= gcc
  OCAMLOPT ?= ocamlopt
  OCAMLC ?= ocamlc
@@ -13,7 +14,14 @@
  OCAMLDEP ?= ocamldep
  OCAMLLEX ?= ocamllex
  OCAMLYACC ?= ocamlyacc
-@@ -17,6 +17,6 @@
+@@ -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