I found another potential bug https://github.com/osquery/osquery/issues/5775 where we need to add a patch for thrift. I will dig into how we are managing patches for libraries and see if this is possible.