Log Message: The buildlink2 wrappers now automatically fix this problem, so no need to patch around it.