cross-*: remove obsolete make-4 patch and repair builds.