Manually merge last fixes from master into 2.0.0

.travis-ci.sh

@@ -110,8 +110,11 @@ function build_one {
     depext=$(opam depext -ls $pkg --no-sources)
     opam depext $pkg
     echo
+    echo "====== Installing dependencies ======"
+    opam install --deps-only $pkg
+    echo
     echo "====== Installing package ======"
-    opam install $pkg
+    opam install -t -v $pkg
     opam remove -a ${pkg%%.*}
     if [ "$depext" != "" ]; then
       case $TRAVIS_OS_NAME in

.travis.yml

@@ -6,8 +6,11 @@ dist: trusty
 sudo: required
 matrix:
   include:
-  - os: linux
+  - os: osx
+    osx_image: xcode7.3
     env: OCAML_VERSION=4.06 OPAM_VERSION=1.2.2
+  - os: linux
+    env: OCAML_VERSION=4.06 OPAM_VERSION=1.2.2 INSTALL_LOCAL=1
   - os: linux
     env: OCAML_VERSION=4.05 OPAM_VERSION=1.2.2
   - os: linux
@@ -22,9 +25,6 @@ matrix:
     env: OCAML_VERSION=4.00 OPAM_VERSION=1.2.2
   - os: linux
     env: OCAML_VERSION=3.12 OPAM_VERSION=1.2.2
-  - os: osx
-    osx_image: xcode7.3
-    env: OCAML_VERSION=4.06 OPAM_VERSION=1.2.2
 notifications:
   email:
   - [email protected]

packages/camlp4/camlp4.4.02+1/opam

@@ -52,7 +52,7 @@ conflicts: ["ocaml-system"]
 flags: light-uninstall
 extra-files: [
   "f0ea53725465260556832398096cef8d3f20b49d.patch"
-  "md5=720f4136f835473317507945b86a9826"
+  "md5=4e15b0fb960be4be48b154bfafbb9a16"
 ]
 url {
   src: "https://github.com/ocaml/camlp4/archive/4.02+1.tar.gz"

packages/camlp4/camlp4.4.02+2/opam

@@ -52,7 +52,7 @@ conflicts: ["ocaml-system"]
 flags: light-uninstall
 extra-files: [
   "f0ea53725465260556832398096cef8d3f20b49d.patch"
-  "md5=720f4136f835473317507945b86a9826"
+  "md5=4e15b0fb960be4be48b154bfafbb9a16"
 ]
 url {
   src: "https://github.com/ocaml/camlp4/archive/4.02+2.tar.gz"

packages/camlp4/camlp4.4.02+3/opam

@@ -52,7 +52,7 @@ conflicts: ["ocaml-system"]
 flags: light-uninstall
 extra-files: [
   "f0ea53725465260556832398096cef8d3f20b49d.patch"
-  "md5=720f4136f835473317507945b86a9826"
+  "md5=4e15b0fb960be4be48b154bfafbb9a16"
 ]
 url {
   src: "https://github.com/ocaml/camlp4/archive/4.02+3.tar.gz"

packages/camlp4/camlp4.4.02+4/opam

@@ -52,7 +52,7 @@ conflicts: ["ocaml-system"]
 flags: light-uninstall
 extra-files: [
   "f0ea53725465260556832398096cef8d3f20b49d.patch"
-  "md5=720f4136f835473317507945b86a9826"
+  "md5=4e15b0fb960be4be48b154bfafbb9a16"
 ]
 url {
   src: "https://github.com/ocaml/camlp4/archive/4.02+4.tar.gz"

packages/camlp4/camlp4.4.02+6/opam

@@ -51,7 +51,7 @@ conflicts: ["ocaml-system"]
 flags: light-uninstall
 extra-files: [
   "f0ea53725465260556832398096cef8d3f20b49d.patch"
-  "md5=720f4136f835473317507945b86a9826"
+  "md5=4e15b0fb960be4be48b154bfafbb9a16"
 ]
 url {
   src: "https://github.com/ocaml/camlp4/archive/4.02+6.tar.gz"

packages/cloudi/cloudi.1.7.3/cloudi.install

@@ -0,0 +1,6 @@
+lib: [
+  "erlang.cmi"
+  "cloudi.cmi"
+  "erlang.cmx"
+  "cloudi.cmx"
+]

packages/conf-ida/conf-ida.0.1/opam

@@ -16,4 +16,4 @@ Can be hinted with IDA_PATH environment variable, e.g.,
 
 IDA_PATH=<path-to-ida> opam install conf-ida"""
 depends: ["ocaml"]
-extra-files: ["find-ida.sh" "md5=96ab35046f4cc638ec24d6938de65449"]
+extra-files: ["find-ida.sh" "md5=dfe0d8953ae4130c4a150b20ab1fbc51"]

packages/ocaml-src/ocaml-src.4.06.1/opam

@@ -9,6 +9,7 @@ depends: [
   "ocaml" {= "4.06.1"}
 ]
 flags: light-uninstall
+extra-files: ["META" "md5=27a3ff867374b1c9004119922494a40c"]
 url {
   src: "http://caml.inria.fr/pub/distrib/ocaml-4.06/ocaml-4.06.1.tar.gz"
   checksum: "md5=fb54287f6f668a31ee0c51265eb30b63"

packages/ocaml-variants/ocaml-variants.4.06.1+32bit/opam

@@ -0,0 +1,52 @@
+opam-version: "2.0"
+synopsis:
+  "OCaml 4.06.1 compiled in 32-bit mode for 64-bit Linux and OS X hosts"
+maintainer: "[email protected]"
+depends: [
+  "ocaml" {= "4.06.1" & post}
+  "base-unix" {post}
+  "base-bigarray" {post}
+  "base-threads" {post}
+]
+conflict-class: "ocaml-core-compiler"
+flags: compiler
+setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
+build: [
+  [
+    "./configure"
+    "-prefix"
+    prefix
+    "-with-debug-runtime"
+    "-cc"
+    "gcc -m32"
+    "-as"
+    "as --32"
+    "-aspp"
+    "gcc -m32 -c"
+    "-host"
+    "i386-linux"
+    "-partialld"
+    "ld -r -melf_i386"
+  ] {os = "linux"}
+  [
+    "./configure"
+    "-prefix"
+    prefix
+    "-with-debug-runtime"
+    "-cc"
+    "gcc -Wl,-read_only_relocs,suppress -arch i386 -m32"
+    "-as"
+    "as -arch i386"
+    "-aspp"
+    "gcc -arch i386 -m32 -c"
+    "-host"
+    "i386-apple-darwin13.2.0"
+  ] {os = "macos"}
+  [make "world"]
+  [make "world.opt"]
+]
+install: [make "install"]
+url {
+  src: "https://github.com/ocaml/ocaml/archive/4.06.1.tar.gz"
+  checksum: "md5=d02eb67b828de22c3f97d94b3c46acba"
+}