Fix building evolution-data-server and grub2