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

[botan] update to 3.3.0 #37252

Merged
merged 3 commits into from
Mar 23, 2024
Merged

Conversation

Cheney-W
Copy link
Contributor

@Cheney-W Cheney-W commented Mar 8, 2024

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 causes Botan to fail on Android platforms using ndkr25. Although this issue has been fixed in ndkr26, since vcpkg ci currently uses ndkr25, I have added the Botan android triplet to ci.baseline.txt.

  • Update libcxx-winpthread-fixes.patch due to randombit/botan@2fad3fd.

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • 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.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@Cheney-W Cheney-W added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. category:port-update The issue is with a library, which is requesting update new revision labels Mar 8, 2024
@@ -97,6 +97,10 @@ boringssl:x64-windows=skip
boringssl:x64-windows-static=skip
boringssl:x64-windows-static-md=skip
boringssl:x86-windows=skip
# Broken with NDK r25 and fixed in NDK r26
Copy link
Member

Choose a reason for hiding this comment

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

@data-queue Should we be updating the Android NDK version in our test runners?

Copy link
Member

Choose a reason for hiding this comment

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

https://developer.android.com/ndk/downloads/ listing everything but the latest as 'old unsupported' suggests that we should.

Copy link
Contributor

Choose a reason for hiding this comment

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

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.

Copy link
Contributor

Choose a reason for hiding this comment

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

The other question is whether to raise the API level to 24. Which significantly improves the C runtime lib.

@Cheney-W Cheney-W marked this pull request as ready for review March 15, 2024 02:09
@Cheney-W Cheney-W marked this pull request as draft March 15, 2024 03:05
@BillyONeal BillyONeal marked this pull request as ready for review March 23, 2024 01:00
@BillyONeal
Copy link
Member

Sorry, I didn't intend my question to block this PR. Thanks for the update!

@BillyONeal BillyONeal merged commit a34c873 into microsoft:master Mar 23, 2024
16 checks passed
@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Mar 25, 2024
@Cheney-W Cheney-W deleted the Dev/Cheney/37068 branch March 25, 2024 02:24
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support category:port-update The issue is with a library, which is requesting update new revision info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[botan] update to 3.3.0 [botan] Doesn't correctly install botan-config.cmake files
4 participants