Attachment 146031 Details for Bug 189710 – Patch for lang/ocaml

[patch] Patch for lang/ocaml

189710.patch (text/plain), 1.67 KB, created by Michael Grünewald on 2014-08-19 12:52:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Grünewald

Created: 2014-08-19 12:52:54 UTC

Size: 1.67 KB

patch

obsolete

>diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
>index 91706bb..173aa92 100644
>--- a/lang/ocaml/Makefile
>+++ b/lang/ocaml/Makefile
>@@ -4,7 +4,7 @@
> # for committer: bump PORTREVISION for math/facile whenever ocaml gets updated
> PORTNAME=	ocaml
> PORTVERSION=	4.01.0
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	lang
> MASTER_SITES=	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \
> 		${MASTER_SITE_GENTOO}
>diff --git a/lang/ocaml/files/patch-ocamlbuild b/lang/ocaml/files/patch-ocamlbuild
>new file mode 100644
>index 0000000..7b4c41a
>--- /dev/null
>+++ b/lang/ocaml/files/patch-ocamlbuild
>@@ -0,0 +1,24 @@
>+--- ocamlbuild/ocamlbuild_executor.ml.orig	2011-10-06 11:39:50.358159931 +0300
>++++ ocamlbuild/ocamlbuild_executor.ml	2011-10-06 12:48:32.966029354 +0300
>+@@ -200,7 +200,11 @@
>+               try
>+                 read fd u 0 (String.length u)
>+               with
>+-              | Unix.Unix_error(_,_,_) -> 0
>++              | Unix.Unix_error(e,_,_)  ->
>++                let msg = error_message e in
>++                display (fun oc -> fp oc
>++                        "Error while reading stdout/stderr: %s\n" msg);
>++                0
>+             in
>+             if m = 0 then
>+               if job.job_dying then
>+@@ -236,6 +240,8 @@
>+       (*display begin fun oc -> fp oc "Terminating job %a\n%!" print_job_id job.job_id; end;*)
>+ 
>+       decr jobs_active;
>++      clear_nonblock (doi job.job_stdout);
>++      clear_nonblock (doi job.job_stderr); (* we would get EAGAIN below otherwise *)
>+       do_read ~loop:true (doi job.job_stdout) job;
>+       do_read ~loop:true (doi job.job_stderr) job;
>+       outputs := FDM.remove (doi job.job_stdout) (FDM.remove (doi job.job_stderr) !outputs);

Flags:

michipili: maintainer-approval+

Actions: View | Diff

Attachments on bug 189710: 146031