Just to confirm here, I believe we've settled upon fix-vhdl-compiler-customization-4.patch