Skip to content

boards/common/makefiles/stdio_cdc_acm.dep.mk: fix #20379

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 1 commit into from
Feb 13, 2024

Conversation

maribu
Copy link
Member

@maribu maribu commented Feb 12, 2024

Contribution description

This fixes compilation issues in tests/pkg/tinyusb_netdev with newer versions of the RISC-V toolchain due to two competing USB stacks being pulled in. With the older toolchain the build system warns:

The following features may conflict: periph_usbdev tinyusb_device

But builds fine (even though surprises at runtime are likely). The newer toolchain takes an issue with the same symbol being linked in more than once (and more than one instance not being weak).

Testing procedure

make BOARD=seeedstudio-gd32 -C tests/pkg/tinyusb_netdev should no longer pull in two USB stacks.

Issues/PRs references

None

This fixes compilation issues in `tests/pkg/tinyusb_netdev` with
newer versions of the RISC-V toolchain due to two competing USB
stacks being pulled in. With the older toolchain the build system
warns:

    The following features may conflict: periph_usbdev tinyusb_device

But builds fine (even though surprises at runtime are likely). The
newer toolchain takes an issue with the same symbol being linked
in more than once (and more than one instance not being `weak`).
@maribu maribu added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Area: build system Area: Build system Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: boards Area: Board ports labels Feb 12, 2024
@maribu
Copy link
Member Author

maribu commented Feb 12, 2024

@MrKevinWeiss should we port this one back to the release branch?

@riot-ci
Copy link

riot-ci commented Feb 12, 2024

Murdock results

✔️ PASSED

38ab147 boards/common/makefiles/stdio_cdc_acm.dep.mk: fix

Success Failures Total Runtime
10011 0 10011 15m:41s

Artifacts

@maribu maribu added this pull request to the merge queue Feb 12, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 12, 2024
@maribu maribu added this pull request to the merge queue Feb 13, 2024
Merged via the queue into RIOT-OS:master with commit 8312df6 Feb 13, 2024
@maribu maribu deleted the boards/common/stdio_cdc_acm branch February 13, 2024 08:48
@maribu
Copy link
Member Author

maribu commented Feb 13, 2024

Thx :)

@MrKevinWeiss
Copy link
Contributor

@MrKevinWeiss should we port this one back to the release branch?

yup :)

@MrKevinWeiss MrKevinWeiss added this to the Release 2024.04 milestone Apr 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: boards Area: Board ports Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants