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

wolfSSL: Update to 5.7.2 #9578

Merged
merged 6 commits into from
Oct 16, 2024
Merged

wolfSSL: Update to 5.7.2 #9578

merged 6 commits into from
Oct 16, 2024

Conversation

dantaras
Copy link
Contributor

@dantaras dantaras commented Oct 8, 2024

No description provided.

@giordano
Copy link
Member

giordano commented Oct 8, 2024

Thanks for your contribution!

@giordano
Copy link
Member

giordano commented Oct 8, 2024

SecTrustEvaluateWithError requires macOS 10.14, you should use that SDK instead of skipping macOS entirely 🙂

@dantaras
Copy link
Contributor Author

dantaras commented Oct 8, 2024

How can I get it to use that version? Do you have an example?

@giordano
Copy link
Member

giordano commented Oct 8, 2024

And the windows error https://buildkite.com/julialang/yggdrasil/builds/13798#01926c26-02b0-4d93-ac29-084611c7bd56/667-952 looks like an error in the build system, which I haven't looked into, but doesn't sound impossible to fix

@giordano
Copy link
Member

giordano commented Oct 8, 2024

How can I get it to use that version? Do you have an example?

ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.14.sdk.tar.xz",
"0f03869f72df8705b832910517b47dd5b79eb4e160512602f593ed243b28715f"),

if [[ "${target}" == x86_64-apple-darwin* ]]; then
pushd ${WORKSPACE}/srcdir/MacOSX10.*.sdk
rm -rf /opt/${target}/${target}/sys-root/System
cp -ra usr/* "/opt/${target}/${target}/sys-root/usr/."
cp -ra System "/opt/${target}/${target}/sys-root/."
export MACOSX_DEPLOYMENT_TARGET=10.14
popd
fi

@dantaras
Copy link
Contributor Author

dantaras commented Oct 8, 2024

Thanks, tried something different, still waiting to see if it worked.

Comment on lines 19 to 21
if [[ "${target}" == *-apple-darwin* ]]; then
CFLAGS="-mmacosx-version-min=10.14"
fi
Copy link
Member

Choose a reason for hiding this comment

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

  1. You're matching also aarch64-apple-darwin, which doesn't have the same problem (we use the 11.0 SDK there)
  2. it isn't sufficient to pretend to have the 10.14 SDK, you actually need to use it as suggested in wolfSSL: Update to 5.7.2 #9578 (comment) 🙂

Side node, export MACOSX_DEPLOYMENT_TARGET=10.14 is a nicer way to accomplish this, since our compiler wrappers read the MACOSX_DEPLOYMENT_TARGET env var, the way you do it the compiler gets duplicate and conflicting -mmacosx-version-min options.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks! Did that and it worked. Any chance we can merge this in without the Windows build?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Trying something for the windows build now.

@dantaras
Copy link
Contributor Author

dantaras commented Oct 9, 2024

This should be ready now.

Copy link
Member

Choose a reason for hiding this comment

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

Can you please upstream this patch so that we'll be able to drop it in the future? Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Opened a PR here: wolfSSL/wolfssl#8068. It'll be a while until that's merged and released though.

@ViralBShah
Copy link
Member

Off-topic:

@giordano It seems that we now require "Update to latest master" button to be hit before merging is allowed. Is that by design - since it probably increases the CI load a fair bit. Sorry to ask here, but I saw it on a couple of PRs (and it may have already been discussed somewhere I didn't see it).

@giordano giordano merged commit 20fc2b1 into JuliaPackaging:master Oct 16, 2024
20 checks passed
@giordano
Copy link
Member

Thanks for pointing it out, that was not intended, my mistake while I was reviewing branch protection settings, I disabled that.

avik-pal pushed a commit to avik-pal/Yggdrasil that referenced this pull request Oct 25, 2024
* wolfSSL: Update to 5.7.2

* wolfSSL: Exclude failing platforms

* wolfSSL: Try a fix for macOS

* wolfSSL: Try the fix for macOS

* wolfSSL: Fix Windows build

---------

Co-authored-by: Viral B. Shah <[email protected]>
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.

3 participants