lang/ocaml: pull in 32-bit compile fix from trunk.
math/py-numpy: ensure correct ABI is hardcoded.