> It may be enough to create an empty gnu/stubs.h.  Could you try that
> instead?

Updated the patch with creating an empty gnu/stubs.h file. It seems to
be enough.