testing/ocaml: add patches from gentoo and fix build on x86