head	1.3;
access;
symbols
	pkgsrc-2023Q3:1.2.0.22
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.20
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.18
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.16
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.14
	pkgsrc-2022Q3-base:1.2
	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.6
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.4
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.2
	pkgsrc-2020Q2-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2023.10.17.12.47.37;	author bouyer;	state dead;
branches;
next	1.2;
commitid	1uWuFCxsmabEIYIE;

1.2
date	2021.01.08.22.08.46;	author bouyer;	state Exp;
branches;
next	1.1;
commitid	OWBqYDpL7BRTlYCC;

1.1
date	2020.05.26.11.12.11;	author bouyer;	state Exp;
branches
	1.1.6.1;
next	;
commitid	qLK89ywckzjc0K9C;

1.1.6.1
date	2021.01.16.16.35.04;	author spz;	state Exp;
branches;
next	;
commitid	tJSU0NVUTVgJfYDC;


desc
@@


1.3
log
@As planned remove xenkernel413 and xentools413. EOL'ed upstream
@
text
@$NetBSD: patch-tools_ocaml_common.make,v 1.2 2021/01/08 22:08:46 bouyer Exp $

Handle ocaml-findlib 1.7.3 already appending destdir

--- tools/ocaml/common.make.orig	2020-10-30 12:24:39.000000000 +0100
+++ tools/ocaml/common.make	2021-01-08 22:09:56.936759911 +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, from Chavdar Ivanov
@
text
@d1 1
a1 1
$NetBSD: patch-tools_ocaml_common.make,v 1.1 2020/05/26 11:12:11 bouyer Exp $
@


1.1
log
@Add xenkernel413 and xentools413 packages, version 4.13.1.
At this time xentools413 will only build on a very recent -current (as of
an hour ago or do - with /usr/include/xen/xenio.h 1.12 or newer)

Xen is a hypervisor which supports running multiple guest operating
systems on a single machine. Guest OSes (also called "domains")
can be either paravirtualised (i.e. make hypercalls in order to
access hardware), run in HVM (Hardware Virtualisation Mode) where
they will be presented with virtual devices, or a combination where
they use hypercalls to access hardware but manage memory themselves.
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.
@
text
@d1 1
a1 1
$NetBSD: patch-tools_ocaml_common.make,v 1.1 2018/07/24 13:40:11 bouyer Exp $
a3 1
Add -unsafe-string to fix build with ocaml-4.06.0 and later
d5 3
a7 3
--- 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
d16 1
a16 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.6.1
log
@Pullup ticket #6395 - requested by bouyer
sysutils/xentools413: build fix

Revisions pulled up:
- sysutils/xentools413/distinfo                                 1.7
- sysutils/xentools413/patches/patch-tools_ocaml_Makefile.rules 1.1
- sysutils/xentools413/patches/patch-tools_ocaml_common.make    1.2

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Fri Jan  8 22:08:46 UTC 2021

   Modified Files:
   	pkgsrc/sysutils/xentools413: distinfo
   	pkgsrc/sysutils/xentools413/patches: patch-tools_ocaml_common.make
   Added Files:
   	pkgsrc/sysutils/xentools413/patches: patch-tools_ocaml_Makefile.rules

   Log Message:
   Fix build with newer ocaml, from Chavdar Ivanov


   To generate a diff of this commit:
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/xentools413/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_Makefile.rules
   cvs rdiff -u -r1.1 -r1.2 \
       pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_common.make
@
text
@d1 1
a1 1
$NetBSD$
d4 1
d6 3
a8 3
--- tools/ocaml/common.make.orig	2020-10-30 12:24:39.000000000 +0100
+++ tools/ocaml/common.make	2021-01-08 22:09:56.936759911 +0100
@@@@ -3,7 +3,7 @@@@
d17 8
a24 1
@@@@ -17,6 +17,6 @@@@
@