-
Notifications
You must be signed in to change notification settings - Fork 7.3k
[botan] update to 3.3.0 #37252
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
Merged
Merged
[botan] update to 3.3.0 #37252
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| diff --git a/src/build-data/botan-config.cmake.in b/src/build-data/botan-config.cmake.in | ||
| index 8d14c4e..46e2cbc 100644 | ||
| --- a/src/build-data/botan-config.cmake.in | ||
| +++ b/src/build-data/botan-config.cmake.in | ||
| @@ -65,21 +65,29 @@ if(DEFINED ${CMAKE_FIND_PACKAGE_NAME}_FOUND AND NOT ${${CMAKE_FIND_PACKAGE_NAME} | ||
| return() | ||
| endif() | ||
|
|
||
| -# botan-config.cmake lives in "${_Botan_PREFIX}/lib/cmake/Botan-X": traverse up to $_Botan_PREFIX | ||
| +# botan-config.cmake lives in "${_Botan_PREFIX}/share/botan": traverse up to $_Botan_PREFIX | ||
| set(_Botan_PREFIX "${CMAKE_CURRENT_LIST_DIR}") | ||
| get_filename_component(_Botan_PREFIX "${_Botan_PREFIX}" DIRECTORY) | ||
| get_filename_component(_Botan_PREFIX "${_Botan_PREFIX}" DIRECTORY) | ||
| -get_filename_component(_Botan_PREFIX "${_Botan_PREFIX}" DIRECTORY) | ||
|
|
||
| %{if build_static_lib} | ||
| if(NOT TARGET Botan::Botan-static) | ||
| add_library(Botan::Botan-static STATIC IMPORTED) | ||
| set_target_properties(Botan::Botan-static | ||
| PROPERTIES | ||
| - IMPORTED_LOCATION "${_Botan_PREFIX}/lib/%{static_lib_name}" | ||
| - INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include/botan-%{version_major}" | ||
| + INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include" | ||
| IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" | ||
| INTERFACE_LINK_OPTIONS "SHELL:%{cxx_abi_flags}") | ||
| + if(EXISTS "${_Botan_PREFIX}/debug/lib/%{static_lib_name}") | ||
| + set_property(TARGET Botan::Botan-static APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) | ||
| + set_target_properties(Botan::Botan-static PROPERTIES | ||
| + IMPORTED_LOCATION_DEBUG "${_Botan_PREFIX}/debug/lib/%{static_lib_name}" | ||
| + ) | ||
| + endif() | ||
| + set_property(TARGET Botan::Botan-static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) | ||
| + set_target_properties(Botan::Botan-static PROPERTIES | ||
| + IMPORTED_LOCATION_RELEASE "${_Botan_PREFIX}/lib/%{static_lib_name}" | ||
| + ) | ||
| endif() | ||
| %{endif} | ||
|
|
||
| @@ -100,10 +108,20 @@ if(NOT TARGET Botan::Botan) | ||
| add_library(Botan::Botan SHARED IMPORTED) | ||
| set_target_properties(Botan::Botan | ||
| PROPERTIES | ||
| - IMPORTED_LOCATION "${_Botan_shared_lib}" | ||
| - IMPORTED_IMPLIB "${_Botan_implib}" | ||
| - INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include/botan-%{version_major}" | ||
| + INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include" | ||
| INTERFACE_LINK_OPTIONS "SHELL:%{cxx_abi_flags}") | ||
| + if(EXISTS "${_Botan_PREFIX}/debug/lib/%{implib_name}") | ||
| + set_property(TARGET Botan::Botan APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) | ||
| + set_target_properties(Botan::Botan PROPERTIES | ||
| + IMPORTED_IMPLIB_DEBUG "${_Botan_PREFIX}/debug/lib/%{implib_name}" | ||
| + IMPORTED_LOCATION_DEBUG "${_Botan_PREFIX}/debug/bin/%{shared_lib_name}" | ||
| + ) | ||
| + endif() | ||
| + set_property(TARGET Botan::Botan APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) | ||
| + set_target_properties(Botan::Botan PROPERTIES | ||
| + IMPORTED_IMPLIB_RELEASE "${_Botan_PREFIX}/lib/%{implib_name}" | ||
| + IMPORTED_LOCATION_RELEASE "${_Botan_PREFIX}/bin/%{shared_lib_name}" | ||
| + ) | ||
| set_property(TARGET Botan::Botan APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) | ||
| set_target_properties(Botan::Botan | ||
| PROPERTIES |
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
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
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
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
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
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
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.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.