Skip to content

Revert "Deprecate Bigarray.*.map_file and add Unix.map_file (#997)"#1102

Merged
xavierleroy merged 1 commit intoocaml:4.05from
gasche:revert-unix-bigarray
Mar 13, 2017
Merged

Revert "Deprecate Bigarray.*.map_file and add Unix.map_file (#997)"#1102
xavierleroy merged 1 commit intoocaml:4.05from
gasche:revert-unix-bigarray

Conversation

@gasche
Copy link
Copy Markdown
Member

@gasche gasche commented Mar 12, 2017

This reverts commit 5ed7200.

GPR#997 introduced a hard dependency of Bigarray on Unix, while there
previously only was a type-level dependency. This break some programs,
such as Camomile, that linked bigarray.cma but not unix.cma.

A solution is being worked out in GPR #1077 to remove the dependency,
but I would like to go forward with opam package testing on the 4.05
branch, and getting the details right for GPR#1077 requires some care,
so I wouldn't feel comfortable rushing to merge it.

I had to handle the following conflicts:

  • otherlibs/unix/unix.mli
    ("@SInCE 4.05.0" was added in faab91a)
  • testsuite/tests/lib-bigarray-file/mapfile.ml
    (changed by 5839c98;
    I kept and adapted the new version)
  • testsuite/tests/lib-bigarray-file/mapfile.reference
    (promoted)

@gasche gasche force-pushed the revert-unix-bigarray branch from 1c11ace to bf5a61b Compare March 12, 2017 16:39
This reverts commit 5ed7200.

GPR#997 introduced a hard dependency of Bigarray on Unix, while there
previously only was a type-level dependency. This break some programs,
such as Camomile, that linked bigarray.cma but not unix.cma.

A solution is being worked out in GPR ocaml#1077 to remove the dependency,
but I would like to go forward with opam package testing on the 4.05
branch, and getting the details right for GPR#1077 requires some care,
so I wouldn't feel comfortable rushing to merge it.

I had to handle the following conflicts:
	otherlibs/unix/unix.mli
          ("@SInCE 4.05.0" was added in faab91a)
	testsuite/tests/lib-bigarray-file/mapfile.ml
          (changed by 5839c98;
           I kept and adapted the new version)
	testsuite/tests/lib-bigarray-file/mapfile.reference
@xavierleroy xavierleroy merged commit 7b52c2b into ocaml:4.05 Mar 13, 2017
@hhugo
Copy link
Copy Markdown
Contributor

hhugo commented May 28, 2017

map_file is missing from UnixLabels

camlspotter pushed a commit to camlspotter/ocaml that referenced this pull request Oct 17, 2017
Revert "Deprecate Bigarray.*.map_file and add Unix.map_file (ocaml#997)"

This revert is intended to unblock the OPAM package testing of 4.05.
stedolan pushed a commit to stedolan/ocaml that referenced this pull request Mar 21, 2023
EmileTrotignon pushed a commit to EmileTrotignon/ocaml that referenced this pull request Jan 12, 2024
* mention Docker Hub images

---------

Co-authored-by: Cuihtlauac ALVARADO <cuihtlauac@tarides.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants