diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2021-02-16 08:30:47 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2021-02-16 08:30:47 +0000 |
| commit | b875ab1f39656c2275205c96ee9dc5e625302a20 (patch) | |
| tree | ae73f4ffd0875aa5a60f7ab55e00eaed18e2b4b8 /sysutils/xentools411/patches/patch-tools_ocaml_common.make | |
| parent | a26c30ae026e5d85e6491c4a57d7d9ea02ff220c (diff) | |
| download | pkgsrc-b875ab1f39656c2275205c96ee9dc5e625302a20.tar.gz | |
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.
Diffstat (limited to 'sysutils/xentools411/patches/patch-tools_ocaml_common.make')
| -rw-r--r-- | sysutils/xentools411/patches/patch-tools_ocaml_common.make | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/sysutils/xentools411/patches/patch-tools_ocaml_common.make b/sysutils/xentools411/patches/patch-tools_ocaml_common.make index 433297eb277..2e87d6ba00b 100644 --- a/sysutils/xentools411/patches/patch-tools_ocaml_common.make +++ b/sysutils/xentools411/patches/patch-tools_ocaml_common.make @@ -1,11 +1,6 @@ -$NetBSD: patch-tools_ocaml_common.make,v 1.1 2018/07/24 13:40:11 bouyer 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 +--- 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 @@ -14,14 +9,7 @@ Add -unsafe-string to fix build with ocaml-4.06.0 and later 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 +@@ -17,6 +17,6 @@ VERSION := 4.1 |