pkg/tinydtls: Only include contrib folder if using tinydtls_sock_dtls #13132
Conversation
This file contains 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
leandrolanzieri
added
Type: bug
chrysn
approved these changes
Jan 15, 2020
There was a problem hiding this comment.
This solves my problem, both in the minimal case of #13121 and the practical code of libOSCORE. The DTLS echo example still works as well. I did not test this in combination with #12104, but as they pull in tinydtls_sock_dtls as well, I don't see why it shouldn't work.
Looks like just the right solution. Thank you!
cgundogan
added
the
CI: ready for build
cgundogan
approved these changes
Jan 15, 2020
There was a problem hiding this comment.
Tested together with @leandrolanzieri
USEPKG=tinydtls make for gnrc_networking should fail without this PR and it compiles with this PR.
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.
Contribution description
As described in #13121, the
contribfolder in tinydtls package is always included, which needs definitions for sock (sock_types.h).This PR modifies the Makefile to only add this directory to the build if the module
tinydtls_sock_dtlsis used, which is the only case when the folder is needed.Testing procedure
examples/dtls-echoandexamples/dtls-sockshould still work as usualIssues/PRs references
Fixes #13121