fix-paths.diff
cross-build.diff