head	1.4;
access;
symbols
	pkgsrc-2020Q2:1.3.0.20
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.3.0.16
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.18
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.14
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.12
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.10
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.8
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.6
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.4
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.2
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.2.0.6
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.4
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.1.0.20
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.18
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.16
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.14
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.12
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.10
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.8
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.6
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.4
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.2
	pkgsrc-2015Q1-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2020.08.19.10.39.25;	author bouyer;	state dead;
branches;
next	1.3;
commitid	DGAMglRf0Jde6FkC;

1.3
date	2018.01.27.19.11.41;	author abs;	state Exp;
branches;
next	1.2;
commitid	4iADm97iEQYKZxoA;

1.2
date	2017.08.23.02.49.48;	author maya;	state Exp;
branches;
next	1.1;
commitid	eh6mieoJ9KHIBh4A;

1.1
date	2015.01.20.16.42.13;	author bouyer;	state Exp;
branches;
next	;
commitid	JA3wqnCTLthdCM6y;


desc
@@


1.4
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-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	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
 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.3
log
@Add -unsafe-string to fix build with ocaml-4.06.0 and later. ++PKGREVISION
@
text
@d1 1
a1 1
$NetBSD: patch-ocaml_common.make,v 1.2 2017/08/23 02:49:48 maya Exp $
@


1.2
log
@Handle ocaml-findlib 1.7.3 already appending DESTDIR

Paranoia bump PKGREVISION for possible functional changes from ocaml update
@
text
@d1 1
a1 1
$NetBSD: patch-ocaml_common.make,v 1.1 2015/01/20 16:42:13 bouyer Exp $
d4 1
d6 2
a7 3
--- 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
d17 8
a24 1
@@@@ -17,6 +17,6 @@@@ OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -
@


1.1
log
@Xen is a virtual machine monitor which supports running multiple
guests operating systems on a single machine. Guest OSes (also
called "domains") require a modified kernel which supports Xen
hypercalls in replacement to access to the physical hardware. At
boot, the xen kernel is loaded along with the guest kernel for the
first domain (called domain0). domain0 has privileges to access
the physical hardware (PCI and ISA devices), administrate other
domains and provide virtual devices (disks and network) to other
domains.

xenkernel45 and xentools45 contains the kernel and tools from
the Xen 4.5.x branch
@
text
@d1 3
a3 1
$NetBSD: patch-ocaml_common.make,v 1.1 2013/05/15 06:58:50 jnemeth Exp $
d7 2
a8 1
@@@@ -3,7 +3,7 @@@@
d17 8
@