backport-trunk-build-system-fixes.patch
