fix(libsodium): fix build failure with platformio (IEC-543)#752
Open
Ashish285 wants to merge 2 commits into
Open
fix(libsodium): fix build failure with platformio (IEC-543)#752Ashish285 wants to merge 2 commits into
Ashish285 wants to merge 2 commits into
Conversation
3 tasks
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a PlatformIO build failure for the libsodium ESP-IDF component when CONFIG_LIBSODIUM_USE_MBEDTLS_SHA is enabled by ensuring the two forced -include shims are passed as indivisible compile-option tokens (avoiding SHELL: handling differences across generators).
Changes:
- Bump
libsodiumcomponent version to a~1revision. - Adjust
libsodium/CMakeLists.txtcompile options to dropSHELL:and use joined-include<path>flags for the SHA256/SHA512 shim headers.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| libsodium/idf_component.yml | Bumps component version to 1.0.22~1 to reflect the packaging/build fix. |
| libsodium/CMakeLists.txt | Changes forced-include flags to be generator-friendly under PlatformIO by making each -include a single token. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
Confirmed this fixes up a regression in behaviour in 21 recorded here: rbouteiller/airplay-esp32#72 |
Member
|
@suda-morris @igrr Can you please check this once? Related: #554 (comment) |
github-actions
Bot
changed the title
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
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.
Change description
When
CONFIG_LIBSODIUM_USE_MBEDTLS_SHAis enabled,libsodium/CMakeLists.txtinjects two -include flags (for the sha256/sha512 port shims) via a CMakeSHELL:generator expression. Building this component under PlatformIO fails, its build generator does not honor theSHELL:prefix, so the option is then re-split on whitespace and CMake deduplicates one of the two -include entries, leaving the relevant header un-included at compile time.Fix
Drop the
SHELL:prefix and join-includeto the header path so the whole flag is a single, indivisible token: