several contrib fixes for building against musl libc

Merge request reports

Loading