Multiarch fixes for devel/zlib