Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modules: thrift: update doc and makefiles to build with macos #74557

Merged
merged 1 commit into from
Jun 25, 2024

Conversation

cfriedt
Copy link
Member

@cfriedt cfriedt commented Jun 19, 2024

Added tabs to the thrift doc so that building works for macos and is consistent with the rest of the documentation in terms of one tab per os (I unfortunately do not have a windows dev environment at my disposal, but would be happy to add those package installation instructions if someone knows what they might be).

Updated client and server makefiles to discover include paths for boost and openssl.

Doc Preview

Added tabs to the thrift doc so that building works for macos
and is consistent with the rest of the documentation in terms
of one tab per os.

Updated client and server makefiles to discover include paths
for boost and openssl.

Signed-off-by: Chris Friedt <cfriedt@tenstorrent.com>
@zephyrbot zephyrbot added manifest manifest-thrift DNM This PR should not be merged (Do Not Merge) labels Jun 19, 2024
@zephyrbot zephyrbot removed manifest manifest-thrift DNM This PR should not be merged (Do Not Merge) labels Jun 20, 2024
Comment on lines +19 to +21
ifeq ($(OS),Darwin)
# get Homebrew prefix
HOMEBREW_PREFIX := $(shell brew --prefix)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I use brew on linux 🫢

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😂 Well, that's one solution, I guess

@zephyrproject-rtos zephyrproject-rtos deleted a comment from zephyrbot Jun 20, 2024
@cfriedt cfriedt marked this pull request as ready for review June 20, 2024 23:05
@zephyrbot zephyrbot requested review from kartben and nashif June 20, 2024 23:05
@cfriedt cfriedt mentioned this pull request Jun 20, 2024
24 tasks
@cfriedt cfriedt added this to the v3.7.0 milestone Jun 24, 2024
@@ -3,6 +3,8 @@

.PHONY: all clean

OS = $(shell uname -s)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
OS = $(shell uname -s)
OS := $(shell uname -s)

@@ -3,6 +3,8 @@

.PHONY: all clean

OS = $(shell uname -s)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
OS = $(shell uname -s)
OS := $(shell uname -s)

samples/modules/thrift/hello/README.rst Show resolved Hide resolved
.. group-tab:: macOS

.. code-block:: bash
:caption: Install thrift dependencies in macOS
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
:caption: Install thrift dependencies in macOS
:caption: Install thrift dependencies on macOS

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm.. do people normally say a package is installed "on" an OS? I usually say "in".

It's possibly "on" in German or French, but I've been saying "in" for the last 20 years or so and I'm a native English speaker.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. Could well be that you're right then. I say "on" but I'm not a native English speaker.

@nashif nashif merged commit 32d8326 into zephyrproject-rtos:main Jun 25, 2024
40 of 46 checks passed
@cfriedt cfriedt deleted the thrift-update branch June 25, 2024 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants