12
0
Fork
You've already forked rust-riot-sys
0

Simpify building, don't links="riot-sys" #38

Open
chrysn wants to merge 3 commits from build-updates into main
pull from: build-updates
merge into: RIOT:main
RIOT:main
RIOT:gneic-from-gnc
RIOT:no-bitfields
RIOT:branch07
RIOT:branch0715
RIOT:c2rust-ondemand
RIOT:marker-for-config-auto-init-enable-debug
chrysn commented 2024年01月31日 17:29:37 +01:00 (Migrated from github.com)
Copy link

With riot-wrappers ceasing to depend on exported variables in https://github.com/RIOT-OS/rust-riot-wrappers/pull/79, the door is open for stopping the re-export of variables and setting links="riot-sys" (which as a matter of fact we don't do: We don't link it in, we merely provide a static library to be combined with it).

This is a breaking change, and would make a 0.8; nonetheless, riot-wrappers could stay compatible with 0.7 and 0.8 simultaneously (we may not want it to because it won't be tested, but it's convenient that riot-wrappers doesn't really need to change -- it can just stop using something riot-sys provides before riot-sys jumps the version and stops providing it).

With riot-wrappers ceasing to depend on exported variables in https://github.com/RIOT-OS/rust-riot-wrappers/pull/79, the door is open for stopping the re-export of variables and setting `links="riot-sys"` (which as a matter of fact we don't do: We don't link it in, we merely provide a static library to be combined with it). This is a breaking change, and would make a 0.8; nonetheless, riot-wrappers could stay compatible with 0.7 and 0.8 simultaneously (we may not want it to because it won't be tested, but it's convenient that riot-wrappers doesn't really need to change -- it can just stop using something riot-sys provides before riot-sys jumps the version and stops providing it).
chrysn commented 2025年01月13日 17:25:58 +01:00 (Migrated from github.com)
Copy link

When we follow through with this, we'll have to have a solution to https://github.com/RIOT-OS/rust-riot-wrappers/pull/144 -- but a) maybe we do something like https://github.com/RIOT-OS/rust-riot-sys/pull/32 first, b) maybe that resolves itself, and c) we can still switch to depending on RIOT configured env stuff. Let's cross that bridge then.

When we follow through with this, we'll have to have a solution to https://github.com/RIOT-OS/rust-riot-wrappers/pull/144 -- but a) maybe we do something like https://github.com/RIOT-OS/rust-riot-sys/pull/32 first, b) maybe that resolves itself, and c) we can still switch to depending on RIOT configured env stuff. Let's cross that bridge then.
This pull request has changes conflicting with the target branch.
  • Cargo.toml
  • build.rs
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin build-updates:build-updates
git switch build-updates

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff build-updates
git switch build-updates
git rebase main
git switch main
git merge --ff-only build-updates
git switch build-updates
git rebase main
git switch main
git merge --no-ff build-updates
git switch main
git merge --squash build-updates
git switch main
git merge --ff-only build-updates
git switch main
git merge build-updates
git push origin main
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
RIOT/rust-riot-sys!38
Reference in a new issue
RIOT/rust-riot-sys
No description provided.
Delete branch "build-updates"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?