head	1.5;
access;
symbols
	pkgsrc-2020Q2:1.4.0.20
	pkgsrc-2020Q2-base:1.4
	pkgsrc-2020Q1:1.4.0.16
	pkgsrc-2020Q1-base:1.4
	pkgsrc-2019Q4:1.4.0.18
	pkgsrc-2019Q4-base:1.4
	pkgsrc-2019Q3:1.4.0.14
	pkgsrc-2019Q3-base:1.4
	pkgsrc-2019Q2:1.4.0.12
	pkgsrc-2019Q2-base:1.4
	pkgsrc-2019Q1:1.4.0.10
	pkgsrc-2019Q1-base:1.4
	pkgsrc-2018Q4:1.4.0.8
	pkgsrc-2018Q4-base:1.4
	pkgsrc-2018Q3:1.4.0.6
	pkgsrc-2018Q3-base:1.4
	pkgsrc-2018Q2:1.4.0.4
	pkgsrc-2018Q2-base:1.4
	pkgsrc-2018Q1:1.4.0.2
	pkgsrc-2018Q1-base:1.4
	pkgsrc-2017Q4:1.3.0.6
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.4
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.1.0.2
	pkgsrc-2017Q2-base:1.1;
locks; strict;
comment	@# @;


1.5
date	2020.08.19.10.39.26;	author bouyer;	state dead;
branches;
next	1.4;
commitid	DGAMglRf0Jde6FkC;

1.4
date	2018.01.27.17.37.51;	author abs;	state Exp;
branches;
next	1.3;
commitid	j2zDC7JgfBsztxoA;

1.3
date	2017.08.23.03.02.14;	author maya;	state Exp;
branches;
next	1.2;
commitid	bqnabuOPrAWYFh4A;

1.2
date	2017.08.22.17.02.11;	author maya;	state Exp;
branches;
next	1.1;
commitid	xdYcu95VxPdqle4A;

1.1
date	2017.03.30.09.15.10;	author bouyer;	state Exp;
branches;
next	;
commitid	V1M4BMcEuvLRkyLz;


desc
@@


1.5
log
@Remove xenkernel and xentools packages older than 4.11.
They're not maintained anymore upstream, and don't build on supported NetBSD
releases.
@
text
@$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	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
-OCAMLMKLIB ?= ocamlmklib
+OCAMLMKLIB ?= ocamlmklib -elfmode
 OCAMLDEP ?= ocamldep
 OCAMLLEX ?= ocamllex
 OCAMLYACC ?= ocamlyacc
@@@@ -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 $@@
@


1.4
log
@Add -unsafe-string to fix build with ocaml-4.06.0 and later. ++PKGREVISION
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@Add comment to patch
@
text
@d4 1
d6 3
a8 3
--- 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 @@@@
d17 8
a24 1
@@@@ -17,6 +17,6 @@@@
@


1.2
log
@Fix with ocaml-findlib update fallout. ocamlfind now includes destdir
resulting in a mismatched PLIST.
PR pkg/52477. Fix by Gary Duzan.

Paranoia bump PKGREVISION
@
text
@d1 4
@


1.1
log
@Add xenkerne48 and xentools48, version 4.8.0.
This includes stub domains support, but it should be considered
experimental at this time. Stub domains hangs with serial ports,
or more more than one virual disk (multiple virtual ethernet have not been
tested).
@
text
@d1 2
a2 4
$NetBSD: patch-ocaml_common.make,v 1.1.1.1 2016/07/04 07:30:52 jnemeth Exp $

--- tools/ocaml/common.make.orig	2015-01-12 17:53:24.000000000 +0100
+++ tools/ocaml/common.make	2015-01-19 13:16:38.000000000 +0100
d12 8
@