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

Re-add -Dopenssl to zap build #63

Merged
merged 5 commits into from
Jan 7, 2024
Merged

Re-add -Dopenssl to zap build #63

merged 5 commits into from
Jan 7, 2024

Conversation

Vemahk
Copy link
Contributor

@Vemahk Vemahk commented Jan 6, 2024

Also includes a small modification to the readme for instructions how to pass it through from any project that depends on zap.

Would resolve #62 if accepted.

Lemme know what ya think.

Vemahk added 2 commits January 5, 2024 20:04
modify readme for instructions how to use it
Copy link
Member

@renerocksai renerocksai left a comment

Choose a reason for hiding this comment

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

I think I like my suggestion for the readme better.

@@ -8,7 +8,7 @@ pub fn build(b: *std.build.Builder) !void {
const optimize = b.standardOptimizeOption(.{});

// Use an os env var to determine whether to build openssl support
const use_openssl = blk: {
const use_openssl = b.option(bool, "openssl", "Use system-installed openssl for TLS support in zap") orelse blk: {
Copy link
Member

Choose a reason for hiding this comment

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

That use of orelse is actually very clever!

README.md Outdated
@@ -273,6 +273,7 @@ Then, in your `build.zig`'s `build` function, add the following before
const zap = b.dependency("zap", .{
.target = target,
.optimize = optimize,
//.openssl = true, // required to use tls
Copy link
Member

Choose a reason for hiding this comment

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

I am not entirely sure if it shouldn't read .openssl = false; // set to true for TLS ...?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, that works. I'll switch that around.

@Vemahk
Copy link
Contributor Author

Vemahk commented Jan 6, 2024

Oh dang, you're pretty fast on that. Noticed I left the comment behind without reflecting the change. Get some sleep, my dude, this can wait 😅

@renerocksai
Copy link
Member

Okokok. G'night 💤

@Vemahk
Copy link
Contributor Author

Vemahk commented Jan 6, 2024

Okay, I'm done... I at least know how git amend works, now 🤔.

Lemme know if you see any other docs that might need to be updated.

@renerocksai renerocksai merged commit 689da4a into zigzap:master Jan 7, 2024
2 checks passed
@renerocksai
Copy link
Member

renerocksai commented Jan 7, 2024

I'll merge right after the CI checks have been completed, then add one more commit to the README, and replay the whole shebang on the zig-0.12.0 branch. Will let you know when ready.

  • CI checks passed
  • PR merged
  • add 1 more commit to README.md (minor formatting stuff)
  • replay all commits on zig-0.12.0 branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Re-add the -Dopenssl option to zap build
2 participants