Fix missing port_undef #20052
Fix missing port_undef #20052
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
mkruskal-google
added
the
🅰️ safe for tests
|
Please sign the CLA |
github-actions
bot
removed
the
🅰️ safe for tests
mkruskal-google
added
the
🅰️ safe for tests
github-actions
bot
removed
the
🅰️ safe for tests
| @@ -347,3 +347,5 @@ PyMODINIT_FUNC PyInit__message() { | |||
|
|
|||
| return m; | |||
| } | |||
|
|
|||
| #include "google/protobuf/port_undef.inc | |||
There was a problem hiding this comment.
Sorry for delay, been busy at work upgrading protobuf and coming back to this side fix. Comedy of errors you can tell i'm not actually building locally before pushing. Will reach out again when i consider this ready.
There was a problem hiding this comment.
I believe i should have fixed the author and the silly typos. Tried to do some local building, but our work machines have some clashes with the version of ccache you expect vs we're using. But i believe the changes to be relatively safe to run on your build nodes.
ERROR: /home/bstoffel/.cache/bazel/_bazel_bstoffel/d6c92e1c5e534d31833b4c3ac5594187/external/com_google_absl/absl/base/BUILD.bazel:60:11: Compiling absl/base/log_severity.cc failed: (Exit 1): ccache failed: error executing CppCompile command (from target @@com_google_absl//absl/base:log_severity) /usr/bin/ccache -U_FORTIFY_SOURCE -fstack-protector -Wall -Wthread-safety -Wself-assign -Wunused-but-set-parameter -Wno-free-nonheap-object -fcolor-diagnostics -fno-omit-frame-pointer '-std=c++14' -MD ... (remaining 34 arguments skipped)
Use --sandbox_debug to see verbose messages from the sandbox and retain the sandbox build root for debugging
/usr/bin/ccache: invalid option -- 'U'
Target //python:google/protobuf/pyext/_message.so failed to build
There was a problem hiding this comment.
How are you running tests? You shouldn't need ccache
mkruskal-google
added
c++
cla: no
wait for user action
🅰️ safe for tests
github-actions
bot
removed
the
🅰️ safe for tests
wilstoff
force-pushed
the
port_undef_fix
branch
from
304df0b to
7ae2cac
Compare
unparser.cc, arenaz_sampler_test.cc, and message_module.cc included port_def.inc but forgot to include the undef file. This can cause some issues on which absl macros are defined: In file included from /opt/protobuf-29/include/google/protobuf/arena.h:36: In file included from /opt/protobuf-29/include/google/protobuf/arena_align.h:63: /opt/protobuf-29/include/google/protobuf/port_def.inc:542:5: error: function-like macro 'ABSL_HAVE_FEATURE' is not defined \#if ABSL_HAVE_FEATURE(address_sanitizer)
wilstoff
force-pushed
the
port_undef_fix
branch
from
7ae2cac to
861d2e6
Compare
|
@wilstoff I actually suspect that this is not the right fix for your compiler error. The main purpose of |
mkruskal-google
added
the
🅰️ safe for tests
github-actions
bot
removed
the
🅰️ safe for tests
|
@acozzette I assumed this was a unity build situation 🤷♂️. We've gotten changes like this before, and in the past have agreed to accept minimal PRs fixing unity issues like this |
We are seeing some GHA breakages; they may have been caused by #20052 as the Bazel build rules couldn't find the necessary headers. PiperOrigin-RevId: 721895082
We are seeing some GHA breakages; they may have been caused by #20052 as the Bazel build rules couldn't find the necessary headers. PiperOrigin-RevId: 721895082
We are seeing some GHA breakages; they may have been caused by #20052 as the Bazel build rules couldn't find the necessary headers. PiperOrigin-RevId: 721895082
We are seeing some GHA breakages; they may have been caused by #20052 as the Bazel build rules couldn't find the necessary headers. PiperOrigin-RevId: 721910271
unparser.cc, arenaz_sampler_test.cc, and message_module.cc included port_def.inc but forgot to include the undef file. This can cause some issues on which absl macros are defined:
In file included from
/opt/protobuf-29/include/google/protobuf/arena.h:36: In file included from
/opt/protobuf-29/include/google/protobuf/arena_align.h:63: /opt/protobuf-29/include/google/protobuf/port_def.inc:542:5: error: function-like macro 'ABSL_HAVE_FEATURE' is not defined #if ABSL_HAVE_FEATURE(address_sanitizer)