patches for building Mesa