[Services] Update tunnelbroker CMake to be MacOS compatible
ClosedPublic
Actions

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

Details

Reviewers

atul
• max
• karol

Commits

rCOMM216e21efd046: [Services] Update tunnelbroker CMake to be MacOS compatible

Summary

Allow for tunnelbroker to be built with MacOS+Clang.
Adds C++17 support by setting OSX requirement above minimum
OSX support.

Also fix pkg-config logic so that the correct libraries are
being linked.

Depends on D4765

Test Plan

On a mac device:

Install nix (optional, but brings in all the correct dependencies)

nix develop # or install protobuf, grpc, awssdk, cryptopp, libuv, boost, amqp separately
cd services/tunnelbroker && mkdir build && cd build && cmake .. && make -j4 -l4

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

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

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

Harbormaster completed remote builds in B11190: Diff 15398.Aug 6 2022, 10:43 AM

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

• jon mentioned this in D4765: [Services] Fix Clang errors with tunnelbroker.Aug 8 2022, 9:09 AM

Hm, running into the following here:

[100%] Linking CXX executable bin/tunnelbroker
ld: warning: directory not found for option '-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/var/empty/lib'
Undefined symbols for architecture arm64:
  "AMQP::TcpConnection::process(int, int)", referenced from:
      AMQP::LibUvHandler::Watcher::callback(uv_poll_s*, int, int) in AmqpManager.cpp.o
  "AMQP::TcpConnection::TcpConnection(AMQP::TcpHandler*, AMQP::Address const&)", referenced from:
      comm::network::AmqpManager::connectInternal() in AmqpManager.cpp.o
  "AMQP::TcpConnection::~TcpConnection()", referenced from:
      comm::network::AmqpManager::connectInternal() in AmqpManager.cpp.o
ld: symbol(s) not found for architecture arm64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[2]: *** [bin/tunnelbroker] Error 1
make[1]: *** [CMakeFiles/tunnelbroker.dir/all] Error 2
make: *** [all] Error 2

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

Hmm, I Must not have updated the diff with the mac changes

Ensure macOS changes have been rebased

Harbormaster failed remote builds in B11220: Diff 15432!Aug 8 2022, 11:21 AM

Rebase

• jon mentioned this in D4757: [Services] Use shared services CMake project from tunnelbroker.Aug 8 2022, 11:50 AM

Harbormaster completed remote builds in B11229: Diff 15447.Aug 8 2022, 12:03 PM

Worked!

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

This is awesome! Can build/run locally and finally get full code completion/debugging/go to definition/etc etc