Skip to content

use sort which is independent of current locale#898

Merged
gasche merged 1 commit intoocaml:trunkfrom
hannesm:stable-sort
Nov 8, 2016
Merged

use sort which is independent of current locale#898
gasche merged 1 commit intoocaml:trunkfrom
hannesm:stable-sort

Conversation

@hannesm
Copy link
Member

@hannesm hannesm commented Nov 8, 2016

According to POSIX, sort is local-dependent. This leads to an actual problem here, since ​caml_sys_is_directory and ​caml_s​ys_isatty are reordered depending on locale.

POSIX says: "When using sort to process pathnames, it is recommended that LC_ALL, or at least LC_CTYPE and LC_COLLATE, are set to POSIX or C in the environment, since pathnames can contain byte sequences that do not form valid characters in some locales, in which case the utility's behavior would be undefined. In the POSIX locale each byte is a valid single-byte character, and therefore this problem is avoided."

This was found via the reproducible automated build - which atm has another issue that the build path is put (over and over) in binaries (..a/.o/.so/.cma/.cmt/.cmti/.cmxs), which should be addressed at another point - see diffoscope OCaml-4.03 (or download the full 140MB diff if you like) for details (or some compiler output, e.g. findlib). For the full set of differences between reproducible runs, look here.

I have no access to MS Windows (neither MacOSX) equipment

Credits for @infinity0 and @gasche for poking me investigating and submitting a PR here.

@infinity0
Copy link
Contributor

As a further note, the vast majority of the build-path differences is due to GCC and hopefully should be fixed by my patch here. If/after that is accepted, the diff should become a bit more manageable. In the meantime this snippet does a half-decent job of filtering them out:

$ grep '│ [-+]' ocaml_4.03.0-5.diffoscope.txt | grep -v 'build-1st\|build-2nd\|DW_AT_\|\b\.\?debug\b'

@infinity0
Copy link
Contributor

infinity0 commented Nov 8, 2016

Oh, not "vast majority" - my snippet was too eager. There is also quite a lot of differences in cmxs, cmt files etc.

$ grep '│ [-+]' ocaml_4.03.0-5.diffoscope.txt | grep -v 'DW_AT_\|\b\.\?debug\b' | less

^ that should be a bit more targeted towards ignoring only the GCC things.

@gasche
Copy link
Member

gasche commented Nov 8, 2016

I pushed this change to INRIA's continuous integration machines, that have checked it on all sort of MacOS and Windows machines (both msvc and cygwin), and it seems to build fine there. I would be in favor of merging the PR.

The one thing I regret is that you don't have a change entry. I agree the change is very small, and not directly noticeably by users, but I think the larger arc of reproducible-build work is interesting, also work-consuming, so you and @infinity0 would deserve to get explicit credit for it. I would suggest the following:

### Build system:

- GPR#898: fix locale-dependence of primitive list order,
  detected through reproducible-builds.org.
  (Hannes Mehnert, review by Gabriel Scherer and Ximin Luo)

(The "Build system" category was present in the 4.04.0 Changelog, but it's not present in 4.05 changes yet.)

@hannesm
Copy link
Member Author

hannesm commented Nov 8, 2016

@gasche thx; sounds good to me. will you add the changes entry when merging, or should I copy+paste your text and commit here?

@gasche
Copy link
Member

gasche commented Nov 8, 2016

I think the best is for your to include a change entry in your commit, amend, and push-force, so that it comes with the modification itself instead of separately.

@hannesm
Copy link
Member Author

hannesm commented Nov 8, 2016

done, there was a ### Compiler distribution build system: which sounded like the right heading to me

@gasche gasche merged commit e4ec5ee into ocaml:trunk Nov 8, 2016
@gasche
Copy link
Member

gasche commented Nov 8, 2016

Thanks! Indeed.

@hannesm hannesm deleted the stable-sort branch November 8, 2016 18:50
camlspotter pushed a commit to camlspotter/ocaml that referenced this pull request Oct 17, 2017
use sort which is independent of current locale
stedolan pushed a commit to stedolan/ocaml that referenced this pull request Oct 25, 2022
sadiqj pushed a commit to sadiqj/ocaml that referenced this pull request Feb 21, 2023
stedolan pushed a commit to stedolan/ocaml that referenced this pull request Mar 21, 2023
b11eea1 flambda-backend: Introduce Import_info (ocaml#1036)
bc5b135 flambda-backend: Fix `ocamlobjinfo` on flambda2 .cmx files (ocaml#1029)
c8babbd flambda-backend: Compilation_unit optimisations (ocaml#1035)
e8d3e22 flambda-backend: Use 4.14.0 opam switch for building (includes upgrading ocamlformat to 0.24.1) (ocaml#1030)
eb14a86 flambda-backend: Port PR81 from ocaml-jst (ocaml#1024)
131bc12 flambda-backend: Merge ocaml-jst 2022-12-13 (ocaml#1022)
06c189a flambda-backend: Make stack allocation the default (ocaml#1013)
98debd5 flambda-backend: Initial support for value slots not of value kind (ocaml#946)
deb1714 flambda-backend: Add is_last flag to closinfo words (ocaml#938)
d07fce1 flambda-backend: Disable poll insertion in Configure (ocaml#967)
0f1ce0e flambda-backend: Regenerate ocaml/configure autoconf 2.69 (instead of 2.71) (ocaml#1012)
27132d8 flambda-backend: Fix for spurious typing error related to expanding through functor arguments (ocaml#997)
724fb68 flambda-backend: Use `Compilation_unit.t` instead of `Ident.t` for globals (ocaml#871)
396d5b8 flambda-backend: Add a test for frametable setup in natdynlinked libraries (ocaml#983)
b73ab12 flambda-backend: Fix invocation of `caml_shared_startup` in native dynlink (ocaml#980)
7c7d75a flambda-backend: Fix split_default_wrapper which did not trigger anymore with flambda2 (ocaml#970)
8fb75bd flambda-backend: Port ocaml#11727 and ocaml#11732 (ocaml#965)
fdb7987 flambda-backend: Fix include functor issue after 4.14 merge. (ocaml#948)
9745cdb flambda-backend: Print -dprofile/-dtimings output to stdout like 4.12 (ocaml#943)
5f51f21 flambda-backend: Merge pull request ocaml#932 from mshinwell/4.14-upgrade
841687d flambda-backend: Run make alldepend in ocaml/ (ocaml#936)
72a7658 flambda-backend: Remove reformatting changes only in dynlink/dune (preserving PR889 and adjusting to minimise diff)
6d758cd flambda-backend: Revert whitespace changes in dune files, to match upstream
c86bf6e flambda-backend: Remove duplicate tests for polling
971dbeb flambda-backend: Testsuite fixes
32f8356 flambda-backend: Topeval fix for symbols patch
befea01 flambda-backend: Compilation fixes / rectify merge faults
a84543f flambda-backend: Merge ocaml-jst
8e65056 flambda-backend: Merge ocaml-jst
4d70045 flambda-backend: Remove filename from system frametable (amd64) (ocaml#920)
5e57b7d flambda-backend: Bugfix for runtime frame_descr logic for C frames (ocaml#918)
6423d5e flambda-backend: Merge pull request ocaml#914 from mshinwell/merge-ocaml-jst-2022-10-24
ead605c flambda-backend: Add a missing Extract_exception (ocaml#916)
c8f1481 flambda-backend: Resolve conflicts and add specialise/specialised attributes to Builtin_attributes
cf4d0d3 flambda-backend: Merge fixes (ocaml#21)
c2f742f flambda-backend: Re-enable some tests for Flambda2 (ocaml#881)
3d38d13 flambda-backend: Long frames in frametable (ocaml#797)
85aec7b flambda-backend: Add loop attribute to Builtin_attributes
c0f16e3 flambda-backend: Compilation fixes
90dea23 flambda-backend: Merge flambda-backend/main
5acc6ea flambda-backend: Fixes after merge
e501946 flambda-backend: Merge ocaml-jst
115083b flambda-backend: Merge ocaml-jst
9943b2e flambda-backend: Revert "Revert "Transform tail-recursive functions into recursive continuations (ocaml#893)"" (ocaml#909)
ce339f1 flambda-backend: Fix alloc modes and call kinds for overapplications (ocaml#902)
e6a317c flambda-backend: Revert "Transform tail-recursive functions into recursive continuations (ocaml#893)"
853c488 flambda-backend: Transform tail-recursive functions into recursive continuations (ocaml#893)
5a977e4 flambda-backend: Fix missing End_region primitives on switch arms (ocaml#898)
7fa7f9d flambda-backend: Add missing dependencies to Dune files (ocaml#889)
3cd36f0 flambda-backend: Have Lambda `Pgetglobal` and `Psetglobal` take `Compilation_unit.t` (ocaml#896)
7565915 flambda-backend: [@poll error] attribute (ocaml#745)
9eb9448 flambda-backend: Backport the main safepoints PRs (ocaml#740)
689bdda flambda-backend: Add strict mode for ocamldep (ocaml#892)

git-subtree-dir: ocaml
git-subtree-split: b11eea1
EmileTrotignon pushed a commit to EmileTrotignon/ocaml that referenced this pull request Jan 12, 2024
* Use Name instead of Package.Name

* Use Version instead of Package.Version

---------

Co-authored-by: Cuihtlauac ALVARADO <[email protected]>
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