[botan] update to 3.3.0#37252
Merged
BillyONeal merged 3 commits intomicrosoft:masterfrom Mar 23, 2024
Merged
Conversation
e616652 to
2ce903f
Compare
BillyONeal
reviewed
Mar 14, 2024
| boringssl:x64-windows-static=skip | ||
| boringssl:x64-windows-static-md=skip | ||
| boringssl:x86-windows=skip | ||
| # Broken with NDK r25 and fixed in NDK r26 |
Member
There was a problem hiding this comment.
@data-queue Should we be updating the Android NDK version in our test runners?
Member
There was a problem hiding this comment.
https://developer.android.com/ndk/downloads/ listing everything but the latest as 'old unsupported' suggests that we should.
Contributor
There was a problem hiding this comment.
I really think you should. At least add the NDK to the image, so that the AZP scripts can switch at another point in time.
FTR this is the TODO: #35851.
Contributor
There was a problem hiding this comment.
The other question is whether to raise the API level to 24. Which significantly improves the C runtime lib.
Member
|
Sorry, I didn't intend my question to block this PR. Thanks for the update! |
7 tasks
BillyONeal
pushed a commit
that referenced
this pull request
Jun 17, 2024
Passing on https://dev.azure.com/vcpkg/public/_build/results?buildId=103938&view=results. ``` PASSING, REMOVE FROM FAIL LIST: c4core:arm-neon-android PASSING, REMOVE FROM FAIL LIST: botan:arm-neon-android PASSING, REMOVE FROM FAIL LIST: concurrencpp:arm-neon-android PASSING, REMOVE FROM FAIL LIST: cppgraphqlgen:arm-neon-android PASSING, REMOVE FROM FAIL LIST: graphicsmagick:arm-neon-android PASSING, REMOVE FROM FAIL LIST: libcoro:arm-neon-android PASSING, REMOVE FROM FAIL LIST: ms-ifc-sdk:arm-neon-android PASSING, REMOVE FROM FAIL LIST: stx:arm-neon-android PASSING, REMOVE FROM FAIL LIST: yoga:arm-neon-android PASSING, REMOVE FROM FAIL LIST: c4core:x64-android PASSING, REMOVE FROM FAIL LIST: botan:x64-android PASSING, REMOVE FROM FAIL LIST: concurrencpp:x64-android PASSING, REMOVE FROM FAIL LIST: cppgraphqlgen:x64-android PASSING, REMOVE FROM FAIL LIST: graphicsmagick:x64-android PASSING, REMOVE FROM FAIL LIST: libcoro:x64-android PASSING, REMOVE FROM FAIL LIST: ms-ifc-sdk:x64-android PASSING, REMOVE FROM FAIL LIST: stx:x64-android PASSING, REMOVE FROM FAIL LIST: yoga:x64-android PASSING, REMOVE FROM FAIL LIST: c4core:arm64-android PASSING, REMOVE FROM FAIL LIST: botan:arm64-android PASSING, REMOVE FROM FAIL LIST: concurrencpp:arm64-android PASSING, REMOVE FROM FAIL LIST: cppgraphqlgen:arm64-android PASSING, REMOVE FROM FAIL LIST: graphicsmagick:arm64-android PASSING, REMOVE FROM FAIL LIST: libcoro:arm64-android PASSING, REMOVE FROM FAIL LIST: ms-ifc-sdk:arm64-android PASSING, REMOVE FROM FAIL LIST: stx:arm64-android PASSING, REMOVE FROM FAIL LIST: yoga:arm64-android ``` Added `c4core` to `ci.baseline.txt` by #29406, which has been fixed by #39287. Added `botan` to `ci.baseline.txt` by #37252, which has been fixed by #38975. Added `concurrencpp` to `ci.baseline.txt` by #29406, which may have been fixed by #39160. Added `cppgraphqlgen` to `ci.baseline.txt` by #29406, which may have been fixed by #38975. Added `graphicsmagick` to `ci.baseline.txt` by #29406, which has been fixed by #39210. Added `libcoro` to `ci.baseline.txt` by #30623, which may have been fixed by #38975. Added `ms-ifc-sdk` to `ci.baseline.txt` by #35972, which may have been fixed by #39210. Added `stx` to `ci.baseline.txt` by #29406, which may have been fixed by #38975. Added `yoga` to `ci.baseline.txt` by #37507, which may have been fixed by #38975.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #37068
Fixes #35950
Since the upstream's commit 2ff1de9, upstream provided an option to generate cmake usage, but the generated config.cmake file does not fit the vcpkg environment, so I added a patch to make it compatible with the vcpkg system.
All features and usage passed with following triplets:
x86-windows
x64-windows
x64-windows-static
Since the commit randombit/botan@3ab7159, the upstream added
#include <ranges>in the source, which causesBotanto fail on Android platforms usingndkr25. Although this issue has been fixed inndkr26, since vcpkg ci currently usesndkr25, I have added the Botan android triplet toci.baseline.txt.Update
libcxx-winpthread-fixes.patchdue to randombit/botan@2fad3fd.The "supports" clause reflects platforms that may be fixed by this new version.Any fixed CI baseline entries are removed from that file.Any patches that are no longer applied are deleted from the port's directory../vcpkg x-add-version --alland committing the result.