Skip to content

pkg/bplib: Move Makefile out of patches - #22620

Merged
crasbe merged 1 commit into
RIOT-OS:masterfrom
RainbowSimon:bplib-buildsystem-improvements
Aug 26, 2026
Merged

pkg/bplib: Move Makefile out of patches#22620
crasbe merged 1 commit into
RIOT-OS:masterfrom
RainbowSimon:bplib-buildsystem-improvements

Conversation

@RainbowSimon

@RainbowSimon RainbowSimon commented Aug 25, 2026

Copy link
Copy Markdown
Contributor

Contribution description

Before, I placed the makefile compiling the library itself as a patch inside the bplib folder. For multiple reasons this is bad.

Why this is better / Why was it bad before?

  • build-system: introduce MODULE_DEFS_NEEDED list #22561 did not consider this case (rightfully so), now it can be easily added to the .include file.
  • This is much easier to change than to change a patch every time
  • When defines changed the core library was not rebuilt (which is bad if these defines changes something in the core library, like the local EID)

The patch still remains and will be removed when I update the version of bplib.

Currently the Makefiles contain all the includes/dependencies for all submodules (e.g. CLAs). When more such submodules are added I would also change this to use sub-Makefiles and include them, but for now this should still be fine.

Testing procedure

Since this is a buildsystem change it should be fine that it still compiles. It does and the examples/networking/dtn/bplib_cla_udp still works as expected on native.

Issues/PRs references

  • none

Declaration of AI-Tools / LLMs usage:

AI-Tools / LLMs that were used are:

  • none

@github-actions github-actions Bot added the Area: pkg Area: External package ports label Aug 25, 2026
@crasbe crasbe added Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR AI: Not Used AI was stated to not be used in this PR/Issue labels Aug 25, 2026
@riot-ci

riot-ci commented Aug 25, 2026

Copy link
Copy Markdown

Murdock results

✔️ PASSED

a3221e6 pkg/bplib: Move Makefile out of patches

Success Failures Total Runtime
11277 0 11277 12m:33s

Artifacts

@crasbe crasbe left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked on skyleaf and it still compiles with GCC and LLVM with the guarded CFLAGS.

Comment thread pkg/bplib/Makefile.bplib Outdated
Comment thread pkg/bplib/Makefile.bplib Outdated
Comment thread pkg/bplib/Makefile.bplib Outdated

@crasbe crasbe left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Please squash :)

Before, I placed the makefile compiling the library itself as a patch
inside the bplib folder. For multiple reasons this is bad.
The patch still remains and will be removed when I update the version of
bplib.
@RainbowSimon
RainbowSimon force-pushed the bplib-buildsystem-improvements branch from 53010cc to a3221e6 Compare August 26, 2026 11:39
@RainbowSimon

Copy link
Copy Markdown
Contributor Author

I am a little confused why this works now even though the package and module names are both bplib, but this caused some issues with decadriver

@crasbe
crasbe enabled auto-merge August 26, 2026 11:55
@crasbe
crasbe added this pull request to the merge queue Aug 26, 2026
Merged via the queue into RIOT-OS:master with commit 9b5a196 Aug 26, 2026
26 checks passed
RainbowSimon added a commit to RainbowSimon/RIOT that referenced this pull request Aug 27, 2026
TODO: move all patches together into one commit, preferabbly before all
other ones.

Most of the patches of 7.0.2 remain and were cherry picked onto 7.0.5.
The Makefile was removed due to PR RIOT-OS#22620.
RainbowSimon added a commit to RainbowSimon/RIOT that referenced this pull request Aug 27, 2026
TODO: move all patches together into one commit, preferabbly before all
other ones.

Most of the patches of 7.0.2 remain and were cherry picked onto 7.0.5.
The Makefile was removed due to PR RIOT-OS#22620.
RainbowSimon added a commit to RainbowSimon/RIOT that referenced this pull request Aug 27, 2026
TODO: move all patches together into one commit, preferabbly before all
other ones.

Most of the patches of 7.0.2 remain and were cherry picked onto 7.0.5.
The Makefile was removed due to PR RIOT-OS#22620.
RainbowSimon added a commit to RainbowSimon/RIOT that referenced this pull request Aug 31, 2026
Most of the patches of 7.0.2 remain and were cherry picked onto 7.0.5.
The Makefile patch was removed due to PR RIOT-OS#22620.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AI: Not Used AI was stated to not be used in this PR/Issue Area: pkg Area: External package ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants