More revdeps fixes for dune 3.0

[kit-ty-kate]

See #20758

cc @pirbo @gpetiot @c-cube @talex5 @UnixJunkie @Stevendeo

[kit-ty-kate]

cc @mooreryan

[talex5]

What was the error with capnp? The tests run for me:

capnp-ocaml (master) $ dune --version
3.0.2
capnp-ocaml (master) $ dune runtest
capnp-ocaml (master) $ 

They're also passing in ocaml-ci with dune.3.0.2.

[kit-ty-kate]

#=== ERROR while compiling capnp.3.3.0 ========================================#
# context              2.0.10 | linux/x86_64 | ocaml-base-compiler.4.13.1 | file:///home/opam/opam-repository
# path                 ~/.opam/4.13/.opam-switch/build/capnp.3.3.0
# command              ~/.opam/opam-init/hooks/sandbox.sh build dune build -p capnp -j 31 @runtest @src/benchmark/benchmarks
# exit-code            1
# env-file             ~/.opam/log/capnp-6573-b76d46.env
# output-file          ~/.opam/log/capnp-6573-b76d46.out
### output ###
# File "src/tests/dune", line 6, characters 0-135:
#  6 | (rule
#  7 |  (targets test.ml test.mli)
#  8 |  (deps
#  9 |   (:< test.capnp)
# 10 |   ../compiler/main.bc)
# 11 |  (action
# 12 |   (run capnpc -o ../compiler/main.bc %{<})))
# (cd _build/default/src/tests && /usr/bin/capnpc -o ../compiler/main.bc test.capnp)
# kj/filesystem-disk-unix.c++:1681: warning: PWD environment variable doesn't match current directory; pwd = /home/opam/.opam/4.13/.opam-switch/build/capnp.3.3.0
# test.capnp:26:20-31: error: Import failed: c++.capnp
# test.capnp:30:2-5: error: Not defined: Cxx
# test.capnp:694:28-31: error: Not defined: Cxx
# test.capnp:704:43-46: error: Not defined: Cxx
# test.capnp:717:27-30: error: Not defined: Cxx
# test.capnp:718:29-32: error: Not defined: Cxx
# test.capnp:722:27-30: error: Not defined: Cxx
# test.capnp:692:28-31: error: Not defined: Cxx
# test.capnp:701:13-16: error: Not defined: Cxx
# test.capnp:698:24-27: error: Not defined: Cxx
# test.capnp:707:34-37: error: Not defined: Cxx
# test.capnp:708:49-52: error: Not defined: Cxx
# test.capnp:706:24-27: error: Not defined: Cxx
# test.capnp:713:18-21: error: Not defined: Cxx
# test.capnp:710:28-31: error: Not defined: Cxx
# test.capnp:727:48-51: error: Not defined: Cxx
# test.capnp:727:75-78: error: Not defined: Cxx
# test.capnp:726:40-43: error: Not defined: Cxx
# File "src/tests/dune", line 30, characters 0-150:
# 30 | (rule
# 31 |  (targets testLists.ml testLists.mli)
# 32 |  (deps
# 33 |   (:< testLists.capnp)
# 34 |   ../compiler/main.bc)
# 35 |  (action
# 36 |   (run capnpc -o ../compiler/main.bc %{<})))
# (cd _build/default/src/tests && /usr/bin/capnpc -o ../compiler/main.bc testLists.capnp)
# kj/filesystem-disk-unix.c++:1681: warning: PWD environment variable doesn't match current directory; pwd = /home/opam/.opam/4.13/.opam-switch/build/capnp.3.3.0
# test.capnp:26:20-31: error: Import failed: c++.capnp
# test.capnp:30:2-5: error: Not defined: Cxx
# File "src/tests/dune", line 14, characters 0-156:
# 14 | (rule
# 15 |  (targets test_import.ml test_import.mli)
# 16 |  (deps
# 17 |   (:< test-import.capnp)
# 18 |   ../compiler/main.bc)
# 19 |  (action
# 20 |   (run capnpc -o ../compiler/main.bc %{<})))
# (cd _build/default/src/tests && /usr/bin/capnpc -o ../compiler/main.bc test-import.capnp)
# kj/filesystem-disk-unix.c++:1681: warning: PWD environment variable doesn't match current directory; pwd = /home/opam/.opam/4.13/.opam-switch/build/capnp.3.3.0
# test.capnp:26:20-31: error: Import failed: c++.capnp
# test.capnp:30:2-5: error: Not defined: Cxx
# (cd _build/default/src/benchmark && /usr/bin/capnpc -o ../compiler/main.bc eval.capnp)
# kj/filesystem-disk-unix.c++:1681: warning: PWD environment variable doesn't match current directory; pwd = /home/opam/.opam/4.13/.opam-switch/build/capnp.3.3.0
# eval.capnp --> eval.mli eval.ml
# (cd _build/default/src/tests && /usr/bin/capnpc -o ../compiler/main.bc testCycles.capnp)
# kj/filesystem-disk-unix.c++:1681: warning: PWD environment variable doesn't match current directory; pwd = /home/opam/.opam/4.13/.opam-switch/build/capnp.3.3.0
# testCycles.capnp --> testCycles.mli testCycles.ml
# (cd _build/default/src/benchmark && /usr/bin/capnpc -o ../compiler/main.bc carsales.capnp)
# kj/filesystem-disk-unix.c++:1681: warning: PWD environment variable doesn't match current directory; pwd = /home/opam/.opam/4.13/.opam-switch/build/capnp.3.3.0
# carsales.capnp --> carsales.mli carsales.ml
# (cd _build/default/src/benchmark && /usr/bin/capnpc -o ../compiler/main.bc catrank.capnp)
# kj/filesystem-disk-unix.c++:1681: warning: PWD environment variable doesn't match current directory; pwd = /home/opam/.opam/4.13/.opam-switch/build/capnp.3.3.0
# catrank.capnp --> catrank.mli catrank.ml

Some rules have a missing dependency on c++.capnp

[talex5]

Ah, I see - the released version is still for dune 1!