[Services] Fix Clang errors with tunnelbroker
ClosedPublic
Actions

Authored by • jon on Aug 6 2022, 10:24 AM.

Details

Reviewers

atul
• max
• karol

Commits

rCOMM6fc21120f932: [Services] Fix Clang errors with tunnelbroker

Summary

Clang doesn't provide an alias for usize_t which
corresponds directly to amqp's overloaded types. So
explicity cast to a type which amqp has an overload for.

Test Plan

Follow test plan from D4766 on a mac device

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

• jon created this revision.Aug 6 2022, 10:24 AM

Herald added subscribers: • abosh, • adrian, tomek, ashoat. · View Herald TranscriptAug 6 2022, 10:24 AM

• jon added a parent revision: D4764: [Nix] Build amqp-cpp with tcp extension on mac.Aug 6 2022, 10:24 AM

• jon added a child revision: D4766: [Services] Update tunnelbroker CMake to be MacOS compatible.Aug 6 2022, 10:31 AM

Harbormaster completed remote builds in B11189: Diff 15397.Aug 6 2022, 10:36 AM

• jon requested review of this revision.Aug 6 2022, 10:36 AM

• jon edited the test plan for this revision. (Show Details)Aug 8 2022, 9:09 AM

Running into the following:

[  0%] Built target cargo-build_rust-notifications
Consolidate compiler generated dependencies of target comm-tunnelbroker-grpc
[ 14%] Built target comm-tunnelbroker-grpc
Consolidate compiler generated dependencies of target comm-services-common
[ 19%] Building CXX object common/CMakeFiles/comm-services-common.dir/DatabaseManagerBase.cpp.o
[ 23%] Building CXX object common/CMakeFiles/comm-services-common.dir/DynamoDBTools.cpp.o
[ 28%] Linking CXX static library libcomm-services-common.a
[ 33%] Built target comm-services-common
[ 38%] Building CXX object CMakeFiles/tunnelbroker.dir/src/Amqp/AmqpManager.cpp.o
In file included from /Users/atul/comm/services/tunnelbroker/src/Amqp/AmqpManager.cpp:1:
In file included from /Users/atul/comm/services/tunnelbroker/src/Amqp/AmqpManager.h:6:
/nix/store/3vkd0v2jnpihwakl088fjj4zwv9ylcxn-amqp-cpp-4.3.16/include/amqpcpp/libuv.h:22:10: fatal error: 'uv.h' file not found
#include <uv.h>
         ^~~~~~
1 error generated.
make[2]: *** [CMakeFiles/tunnelbroker.dir/src/Amqp/AmqpManager.cpp.o] Error 1
make[1]: *** [CMakeFiles/tunnelbroker.dir/all] Error 2
make: *** [all] Error 2
make: INTERNAL: Exiting with 5 jobserver tokens available; should be 4!

This revision now requires changes to proceed.Aug 8 2022, 10:46 AM

Ensure macOS changes have been rebased

Harbormaster failed remote builds in B11219: Diff 15431!Aug 8 2022, 11:20 AM

Rebase

Harbormaster completed remote builds in B11228: Diff 15446.Aug 8 2022, 12:01 PM

Still running into the following:

In file included from /Users/atul/comm/services/tunnelbroker/src/Amqp/AmqpManager.h:6:
/nix/store/2vc0ap87d1lr4ibm7m41nnx5skmn7qjd-amqp-cpp-4.3.16/include/amqpcpp/libuv.h:22:10: fatal error: 'uv.h' file not found
#include <uv.h>
         ^~~~~~
1 error generated.
make[2]: *** [CMakeFiles/tunnelbroker.dir/src/Amqp/AmqpManager.cpp.o] Error 1
make[1]: *** [CMakeFiles/tunnelbroker.dir/all] Error 2
make: *** [all] Error 2

However, confirmed that everything works in D4766.

Do you think this diff is okay to land based on everything being fixed up in D4766?

This revision now requires changes to proceed.Aug 8 2022, 1:16 PM

atul accepted this revision.Aug 8 2022, 1:29 PM

This revision is now accepted and ready to land.Aug 8 2022, 1:29 PM

Yea, this also needs the pkg-config changes in D4766 to correctly the related libuv headers.

Not sure why linux was working fine. I'm assuming it was because of some transitive dependency adding them through a public interface. And for some reason on mac this isn't the case.

Closed by commit rCOMM6fc21120f932: [Services] Fix Clang errors with tunnelbroker (authored by • jon). · Explain WhyAug 8 2022, 1:45 PM

This revision was automatically updated to reflect the committed changes.

• jon added a commit: rCOMM6fc21120f932: [Services] Fix Clang errors with tunnelbroker.