Louis-Philippe Véronneau pushed to branch master at lintian / lintian
Commits:
-
00c738c0
by Bo YU at 2025-08-22T18:36:01+00:00
4 changed files:
- lib/Lintian/Check/Languages/Ocaml/ByteCode/Misplaced/Path.pm
- t/recipes/checks/languages/ocaml/byte-code/misplaced/path/ocaml-general/build-spec/debian/libocaml-general-ocaml-dev.install
- t/recipes/checks/languages/ocaml/byte-code/misplaced/path/ocaml-general/build-spec/debian/libocaml-general-ocaml.install
- tags/o/ocaml-dev-file-not-in-usr-lib-ocaml.tag
Changes:
... | ... | @@ -41,9 +41,9 @@ has misplaced_files => (is => 'rw', default => sub { [] }); |
41 | 41 | sub visit_installed_files {
|
42 | 42 | my ($self, $item) = @_;
|
43 | 43 | |
44 | - # development files outside /usr/lib/ocaml (.cmi, .cmx, .cmxa)
|
|
44 | +# development files outside /usr/lib/<multiarch>/ocaml/<abi> (.cmi, .cmx, .cmxa)
|
|
45 | 45 | return
|
46 | - if $item->name =~ m{^ usr/lib/ocaml/ }x;
|
|
46 | + if $item->name =~ m{^ usr/lib/[^/]+/ocaml/[^/]+/ }x;
|
|
47 | 47 | |
48 | 48 | # .cma, .cmo and .cmxs are excluded because they can be plugins
|
49 | 49 | push(@{$self->misplaced_files}, $item->name)
|
1 | 1 | symbol-dev.a usr/lib/ocaml/
|
2 | 2 | libbaz.a usr/lib/ocaml/
|
3 | 3 | ocaml/foo.cmi usr/lib/
|
4 | -ocaml/foo.cmi usr/lib/ocaml/
|
|
5 | -ocaml/bar.cmi usr/lib/ocaml/
|
|
6 | -ocaml/baz.cmi usr/lib/ocaml/
|
|
7 | -ocaml/boo.cmi usr/lib/ocaml/
|
|
8 | -ocaml/symbol2.cmx usr/lib/ocaml/
|
|
9 | -ocaml/symbol-dev.cmx usr/lib/ocaml/
|
|
4 | +ocaml/foo.cmi usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/
|
|
5 | +ocaml/bar.cmi usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/
|
|
6 | +ocaml/baz.cmi usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/
|
|
7 | +ocaml/boo.cmi usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/
|
|
8 | +ocaml/symbol2.cmx usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/
|
|
9 | +ocaml/symbol-dev.cmx usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/
|
|
10 | 10 | ocaml/bleh.cmo usr/lib/ocaml/
|
11 | 11 | ocaml/bleh.cma usr/lib/ocaml/
|
12 | 12 | ocaml/META usr/lib/ocaml/ |
1 | -ocaml/foo.cmxa usr/lib/ocaml/
|
|
1 | +ocaml/foo.cmxa usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/
|
|
2 | 2 | ocaml/bar.cmxs usr/lib/ocaml/
|
3 | -ocaml/symbol.cmx usr/lib/ocaml/ |
|
3 | +ocaml/symbol.cmx usr/lib/x86_64-linux-gnu/ocaml/general-ocaml/1.1.1/ocaml/ |
... | ... | @@ -3,7 +3,7 @@ Severity: pedantic |
3 | 3 | Check: languages/ocaml/byte-code/misplaced/path
|
4 | 4 | Explanation: This OCaml package ships development files like <code>*.cmi</code>,
|
5 | 5 | <code>*.cmx</code> or <code>*.cmxa</code> outside of the standard folder
|
6 | - <code>/usr/lib/ocaml</code>.
|
|
6 | + <code>/usr/lib/<multiarch>/ocaml/<abi></code>.
|
|
7 | 7 | .
|
8 | 8 | Those files are used only for compilation and should be placed in a subfolder of
|
9 | 9 | the standard OCaml library path. |