head	1.3;
access;
symbols
	pkgsrc-2022Q2:1.2.0.12
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.10
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.8
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.6
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.4
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.2
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.1.0.20
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.18
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.16
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.12
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.14
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.10
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.8
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.6
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.4
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.2
	pkgsrc-2018Q3-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2022.06.28.16.33.26;	author bouyer;	state dead;
branches;
next	1.2;
commitid	lkljtNX5KSYPgPJD;

1.2
date	2021.02.04.11.45.53;	author bouyer;	state Exp;
branches;
next	1.1;
commitid	61AERuI4XOpn2oGC;

1.1
date	2018.07.24.13.40.11;	author bouyer;	state Exp;
branches
	1.1.20.1;
next	;
commitid	QjVUWJGQIz5tqoLA;

1.1.20.1
date	2021.02.16.08.30.47;	author bsiegert;	state Exp;
branches;
next	;
commitid	t3jsFQQgK8COzUHC;


desc
@@


1.3
log
@Remove xenkernel411 and xenkernel411, they're EOL upstream
@
text
@--- tools/ocaml/common.make.orig	2020-04-17 13:58:20.000000000 +0200
+++ tools/ocaml/common.make	2021-02-04 11:25:02.393221932 +0100
@@@@ -3,7 +3,7 @@@@
 CC ?= gcc
 OCAMLOPT ?= ocamlopt
 OCAMLC ?= ocamlc
-OCAMLMKLIB ?= ocamlmklib
+OCAMLMKLIB ?= ocamlmklib -elfmode
 OCAMLDEP ?= ocamldep
 OCAMLLEX ?= ocamllex
 OCAMLYACC ?= ocamlyacc
@@@@ -17,6 +17,6 @@@@
 
 VERSION := 4.1
 
-OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir)
+OCAMLDESTDIR ?= $(shell $(OCAMLFIND) printconf destdir)
 
 o= >$@@.new && mv -f $@@.new $@@
@


1.2
log
@Fix build with newer ocaml.
Fix xenstored leaking file descriptors and busy-looping over them.
@
text
@@


1.1
log
@Add Xen 4.11.0 packages.
Note that there is a bug in 4.11 (also present in recent 4.6 and 4.8)
which causes an infrequent assert failure when running NetBSD PV guests.
The root cause has not been found, but a workaround is inclued which doesn't
seems to have ill effects. See xenkernel411/patches/patch-zz-bouyer
for details.
@
text
@d1 3
a3 8
$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
d12 1
a12 8
@@@@ -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
@


1.1.20.1
log
@Pullup ticket #6425 - requested by bouyer
sysutils/xentools411: build fix, bugfix

Revisions pulled up:
- sysutils/xentools411/Makefile                                 1.25
- sysutils/xentools411/distinfo                                 1.16
- sysutils/xentools411/patches/patch-tools_ocaml_Makefile.rules 1.1
- sysutils/xentools411/patches/patch-tools_ocaml_common.make    1.2
- sysutils/xentools411/patches/patch-tools_xenstore_xenstored_core.c 1.1

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Thu Feb  4 11:45:53 UTC 2021

   Modified Files:
   	pkgsrc/sysutils/xentools411: Makefile distinfo
   	pkgsrc/sysutils/xentools411/patches: patch-tools_ocaml_common.make
   Added Files:
   	pkgsrc/sysutils/xentools411/patches: patch-tools_ocaml_Makefile.rules
   	    patch-tools_xenstore_xenstored_core.c

   Log Message:
   Fix build with newer ocaml.
   Fix xenstored leaking file descriptors and busy-looping over them.
@
text
@d1 8
a8 3
--- tools/ocaml/common.make.orig	2020-04-17 13:58:20.000000000 +0200
+++ tools/ocaml/common.make	2021-02-04 11:25:02.393221932 +0100
@@@@ -3,7 +3,7 @@@@
d17 8
a24 1
@@@@ -17,6 +17,6 @@@@
@