Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #4490 from AltGr/opam-publish/opam-lib.1.2.2
opam-lib.1.2.2 - via opam-publish
  • Loading branch information
AltGr committed Jul 18, 2015
2 parents e74fe1b + d2548b6 commit ad6d423
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 0 deletions.
5 changes: 5 additions & 0 deletions packages/opam-lib/opam-lib.1.2.2/descr
@@ -0,0 +1,5 @@
The OPAM library

OPAM is The OCaml PAckage Manager. This package contains the OPAM
libraries, that may be used by external tools to access OPAM
installation, state and data.
19 changes: 19 additions & 0 deletions packages/opam-lib/opam-lib.1.2.2/files/fix-wait.diff
@@ -0,0 +1,19 @@
diff --git a/src/core/opamProcess.ml b/src/core/opamProcess.ml
index ca64c89..320c42c 100644
--- a/src/core/opamProcess.ml
+++ b/src/core/opamProcess.ml
@@ -175,9 +175,13 @@ let read_lines f =
List.rev !lines
with Sys_error _ -> []

+let rec waitpid p = try Unix.waitpid [] p with
+ | Unix.Unix_error (Unix.EINTR,_,_) -> waitpid p
+ | Unix.Unix_error (Unix.ECHILD,_,_) -> p, Unix.WEXITED 256
+
let wait p =
let rec iter () =
- let _, status = Unix.waitpid [] p.p_pid in
+ let _, status = waitpid p.p_pid in
match status with
| Unix.WEXITED code ->
let duration = Unix.gettimeofday () -. p.p_time in
29 changes: 29 additions & 0 deletions packages/opam-lib/opam-lib.1.2.2/opam
@@ -0,0 +1,29 @@
opam-version: "1.2"
maintainer: "opam-devel@lists.ocaml.org"
homepage: "https://opam.ocaml.org/"
dev-repo: "https://github.com/ocaml/opam.git"
bug-reports: "https://github.com/ocaml/opam/issues"
authors: [
"Thomas Gazagnaire <thomas@gazagnaire.org>"
"Anil Madhavapeddy <anil@recoil.org>"
"Fabrice Le Fessant <Fabrice.Le_fessant@inria.fr>"
"Frederic Tuong <tuong@users.gforge.inria.fr>"
"Louis Gesbert <louis.gesbert@ocamlpro.com>"
"Guillem Rieu <guillem.rieu@ocamlpro.com>"
"Vincent Bernardoff <vb@luminar.eu.org>"
"Roberto Di Cosmo <roberto@dicosmo.org>"
]
build: [
["./configure"]
[make]
[make "-C" "src" "../opam-lib.install"]
]
depends: [
"ocamlgraph"
"cmdliner"
"dose" {>= "3.2.2+opam" & < "4"}
"cudf"
"re" {>= "1.2.0"}
"ocamlfind" {build}
"jsonm"
]
2 changes: 2 additions & 0 deletions packages/opam-lib/opam-lib.1.2.2/url
@@ -0,0 +1,2 @@
http: "https://github.com/ocaml/opam/archive/1.2.2.tar.gz"
checksum: "61b7d8b3dda9c4e5a77d7ea405985d1e"

0 comments on commit ad6d423

Please sign in to comment.