The latest commit doesn't build, and a few commits before that don't install sofile. (cherry picked from commit 7cbd0c17)
