Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 May 2014 09:02:19 GMT
From:      Jaap Boender <jaapb@kerguelen.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/189498: [maintainer-update] [patch] Build fix for devel/ocaml-lwt
Message-ID:  <201405090902.s4992JCO004176@cgiserv.freebsd.org>
Resent-Message-ID: <201405090910.s499A03c040003@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         189498
>Category:       ports
>Synopsis:       [maintainer-update] [patch] Build fix for devel/ocaml-lwt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 09 09:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Jaap Boender
>Release:        10.0-STABLE
>Organization:
>Environment:
FreeBSD purcell.mdx.ac.uk 10.0-STABLE FreeBSD 10.0-STABLE #15 r264497: Tue Apr 15 12:43:19 BST 2014     root@purcell.mdx.ac.uk:/usr/obj/usr/src/sys/PURCELL  amd64

>Description:
The devel/ocaml-lwt port needs some changing to compile with ocaml 4.01. This has already been done upstream; this is a backport of the fix - upstream hasn't released a new version yet.
>How-To-Repeat:
install devel/ocaml-lwt with ocaml 4.01
>Fix:
patch included.

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 352088)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	lwt
 PORTVERSION=	2.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://ocsigen.org/download/
 PKGNAMEPREFIX=	ocaml-
Index: files/patch-src_unix_lwt_unix.ml
===================================================================
--- files/patch-src_unix_lwt_unix.ml	(revision 0)
+++ files/patch-src_unix_lwt_unix.ml	(working copy)
@@ -0,0 +1,12 @@
+--- src/unix/lwt_unix.ml.orig	2014-05-07 13:01:03.000000000 +0100
++++ src/unix/lwt_unix.ml	2014-05-07 13:01:36.000000000 +0100
+@@ -596,6 +596,9 @@
+ #if ocaml_version >= (3, 13)
+   | O_SHARE_DELETE
+ #endif
++#if ocaml_version >= (4, 01)
++  | O_CLOEXEC
++#endif
+ 
+ #if windows
+ 
Index: files/patch-src_unix_lwt_unix.mli
===================================================================
--- files/patch-src_unix_lwt_unix.mli	(revision 0)
+++ files/patch-src_unix_lwt_unix.mli	(working copy)
@@ -0,0 +1,12 @@
+--- src/unix/lwt_unix.mli.orig	2014-05-07 13:01:48.000000000 +0100
++++ src/unix/lwt_unix.mli	2014-05-07 13:02:09.000000000 +0100
+@@ -315,6 +315,9 @@
+ #if ocaml_version >= (3, 13)
+   | O_SHARE_DELETE
+ #endif
++#if ocaml_version >= (4, 01)
++  | O_CLOEXEC
++#endif
+ 
+ val openfile : string -> open_flag list -> file_perm -> file_descr Lwt.t
+   (** Wrapper for [Unix.openfile]. *)


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405090902.s4992JCO004176>