makefiles/utils/strings.mk: Fix version_is_greater_or_equal #19133

maribu · 2023-01-12T11:12:19Z

Contribution description

The Makefile function version_is_greater_or_equal is used to check if a version of GNU Make is at least the required one. However, it has the built-in assumption the version numbers have to format x.y.z, but Alpine Linux currently ships GNU Make 4.4. This results in $(call _pad_number,3,) which runs printf '$03d' '' in the shell, which is not valid.

This fixes the issue by making _pad_number more robust by fall back to printing 0 with the given padding, if the number given to print is empty.

Testing procedure

Append

$(info A=$(call version_is_greater_or_equal,4.2.0,4.2.0))
$(info B=$(call version_is_greater_or_equal,4.2,4.2.0))
$(info C=$(call version_is_greater_or_equal,4.1,4.2.0))
$(info D=$(call version_is_greater_or_equal,4.1.9,4.2.0))
$(info E=$(call version_is_greater_or_equal,5.1.9,4.2.0))
$(info F=$(call version_is_greater_or_equal,5.0.0,4.2.0))
$(info G=$(call version_is_greater_or_equal,4.2.1,4.2.0))
$(info H=$(call version_is_greater_or_equal,4.3.1,4.2.0))

e.g. to makefiles/utils/strings.mk, build something and observe the info output.

This yields

A=1
B=1
C=
D=
E=1
F=1
G=1
H=1

for me and does not complain about invalid printf invocations.

Issues/PRs references

None

The Makefile function `version_is_greater_or_equal` is used to check if a version of GNU Make is at least the required one. However, it has the built-in assumption the version numbers have to format x.y.z, but Alpine Linux currently ships GNU Make 4.4. This results in `$(call _pad_number,3,)` which runs `printf '$03d' ''` in the shell, which is not valid. This fixes the issue by making `_pad_number` more robust by fall back to printing `0` with the given padding, if the number given to print is empty.

riot-ci · 2023-01-12T11:20:56Z

Murdock results

✔️ PASSED

8c055f0 makefiles/utils/strings.mk: Fix version_is_greater_or_equal

Success	Failures	Total	Runtime
6770	0	6770	14m:33s

Artifacts

Documentation preview

kaspar030

ACK.

bors merge

maribu · 2023-01-12T12:53:52Z

bors merge

bors · 2023-01-12T12:53:53Z

Already running a review

maribu · 2023-01-12T12:54:13Z

bors cancel
bors merge

bors · 2023-01-12T12:54:15Z

Canceled.

maribu · 2023-01-12T13:11:00Z

bors merge already!

bors · 2023-01-12T13:11:02Z

Already running a review

maribu · 2023-01-12T13:20:15Z

sudo bors merge

maribu · 2023-01-12T13:20:29Z

bors merge --force

bors · 2023-01-12T13:20:31Z

Already running a review

maribu · 2023-01-12T13:21:00Z

bors cancel
bors merge

bors · 2023-01-12T13:21:02Z

Canceled.

19128: boards: common: stdio_cdc_acm: let tests wait a bit for serial port r=aabadie a=miri64 19133: makefiles/utils/strings.mk: Fix version_is_greater_or_equal r=maribu a=maribu ### Contribution description The Makefile function `version_is_greater_or_equal` is used to check if a version of GNU Make is at least the required one. However, it has the built-in assumption the version numbers have to format x.y.z, but Alpine Linux currently ships GNU Make 4.4. This results in `$(call _pad_number,3,)` which runs `printf '$03d' ''` in the shell, which is not valid. This fixes the issue by making `_pad_number` more robust by fall back to printing `0` with the given padding, if the number given to print is empty. ### Testing procedure Append ```Makefile $(info A=$(call version_is_greater_or_equal,4.2.0,4.2.0)) $(info B=$(call version_is_greater_or_equal,4.2,4.2.0)) $(info C=$(call version_is_greater_or_equal,4.1,4.2.0)) $(info D=$(call version_is_greater_or_equal,4.1.9,4.2.0)) $(info E=$(call version_is_greater_or_equal,5.1.9,4.2.0)) $(info F=$(call version_is_greater_or_equal,5.0.0,4.2.0)) $(info G=$(call version_is_greater_or_equal,4.2.1,4.2.0)) $(info H=$(call version_is_greater_or_equal,4.3.1,4.2.0)) ``` e.g. to `makefiles/utils/strings.mk`, build something and observe the info output. This yields ``` A=1 B=1 C= D= E=1 F=1 G=1 H=1 ``` for me and does not complain about invalid `printf` invocations. ### Issues/PRs references None Co-authored-by: Martine Lenders <m.lenders@fu-berlin.de> Co-authored-by: Marian Buschsieweke <marian.buschsieweke@ovgu.de>

bors · 2023-01-12T13:42:22Z

Build failed (retrying...):

Murdock

19133: makefiles/utils/strings.mk: Fix version_is_greater_or_equal r=maribu a=maribu ### Contribution description The Makefile function `version_is_greater_or_equal` is used to check if a version of GNU Make is at least the required one. However, it has the built-in assumption the version numbers have to format x.y.z, but Alpine Linux currently ships GNU Make 4.4. This results in `$(call _pad_number,3,)` which runs `printf '$03d' ''` in the shell, which is not valid. This fixes the issue by making `_pad_number` more robust by fall back to printing `0` with the given padding, if the number given to print is empty. ### Testing procedure Append ```Makefile $(info A=$(call version_is_greater_or_equal,4.2.0,4.2.0)) $(info B=$(call version_is_greater_or_equal,4.2,4.2.0)) $(info C=$(call version_is_greater_or_equal,4.1,4.2.0)) $(info D=$(call version_is_greater_or_equal,4.1.9,4.2.0)) $(info E=$(call version_is_greater_or_equal,5.1.9,4.2.0)) $(info F=$(call version_is_greater_or_equal,5.0.0,4.2.0)) $(info G=$(call version_is_greater_or_equal,4.2.1,4.2.0)) $(info H=$(call version_is_greater_or_equal,4.3.1,4.2.0)) ``` e.g. to `makefiles/utils/strings.mk`, build something and observe the info output. This yields ``` A=1 B=1 C= D= E=1 F=1 G=1 H=1 ``` for me and does not complain about invalid `printf` invocations. ### Issues/PRs references None Co-authored-by: Marian Buschsieweke <marian.buschsieweke@ovgu.de>

bors · 2023-01-12T14:59:42Z

Build failed:

Murdock

maribu · 2023-01-12T19:00:19Z

bors retry

bors · 2023-01-12T21:45:01Z

Build succeeded:

maribu · 2023-01-12T22:05:06Z

Thx :)

maribu · 2023-01-12T22:08:09Z

Backport provided in #19135

19135: makefiles/utils/strings.mk: Fix version_is_greater_or_equal [backport 2023.01] r=benpicco a=maribu # Backport of #19133 ### Contribution description The Makefile function `version_is_greater_or_equal` is used to check if a version of GNU Make is at least the required one. However, it has the built-in assumption the version numbers have to format x.y.z, but Alpine Linux currently ships GNU Make 4.4. This results in `$(call _pad_number,3,)` which runs `printf '$03d' ''` in the shell, which is not valid. This fixes the issue by making `_pad_number` more robust by fall back to printing `0` with the given padding, if the number given to print is empty. ### Testing procedure Append ```Makefile $(info A=$(call version_is_greater_or_equal,4.2.0,4.2.0)) $(info B=$(call version_is_greater_or_equal,4.2,4.2.0)) $(info C=$(call version_is_greater_or_equal,4.1,4.2.0)) $(info D=$(call version_is_greater_or_equal,4.1.9,4.2.0)) $(info E=$(call version_is_greater_or_equal,5.1.9,4.2.0)) $(info F=$(call version_is_greater_or_equal,5.0.0,4.2.0)) $(info G=$(call version_is_greater_or_equal,4.2.1,4.2.0)) $(info H=$(call version_is_greater_or_equal,4.3.1,4.2.0)) ``` e.g. to `makefiles/utils/strings.mk`, build something and observe the info output. This yields ``` A=1 B=1 C= D= E=1 F=1 G=1 H=1 ``` for me and does not complain about invalid `printf` invocations. ### Issues/PRs references None Co-authored-by: Marian Buschsieweke <marian.buschsieweke@ovgu.de>

19135: makefiles/utils/strings.mk: Fix version_is_greater_or_equal [backport 2023.01] r=kaspar030 a=maribu # Backport of #19133 ### Contribution description The Makefile function `version_is_greater_or_equal` is used to check if a version of GNU Make is at least the required one. However, it has the built-in assumption the version numbers have to format x.y.z, but Alpine Linux currently ships GNU Make 4.4. This results in `$(call _pad_number,3,)` which runs `printf '$03d' ''` in the shell, which is not valid. This fixes the issue by making `_pad_number` more robust by fall back to printing `0` with the given padding, if the number given to print is empty. ### Testing procedure Append ```Makefile $(info A=$(call version_is_greater_or_equal,4.2.0,4.2.0)) $(info B=$(call version_is_greater_or_equal,4.2,4.2.0)) $(info C=$(call version_is_greater_or_equal,4.1,4.2.0)) $(info D=$(call version_is_greater_or_equal,4.1.9,4.2.0)) $(info E=$(call version_is_greater_or_equal,5.1.9,4.2.0)) $(info F=$(call version_is_greater_or_equal,5.0.0,4.2.0)) $(info G=$(call version_is_greater_or_equal,4.2.1,4.2.0)) $(info H=$(call version_is_greater_or_equal,4.3.1,4.2.0)) ``` e.g. to `makefiles/utils/strings.mk`, build something and observe the info output. This yields ``` A=1 B=1 C= D= E=1 F=1 G=1 H=1 ``` for me and does not complain about invalid `printf` invocations. ### Issues/PRs references None Co-authored-by: Marian Buschsieweke <marian.buschsieweke@ovgu.de>

maribu requested a review from kaspar030 January 12, 2023 11:12

github-actions bot added the Area: build system Area: Build system label Jan 12, 2023

kaspar030 approved these changes Jan 12, 2023

View reviewed changes

bors bot merged commit 1dcccdc into RIOT-OS:master Jan 12, 2023

maribu deleted the makefiles/utils/strings.mk branch January 12, 2023 22:05

maribu mentioned this pull request Jan 12, 2023

makefiles/utils/strings.mk: Fix version_is_greater_or_equal [backport 2023.01] #19135

Merged

jia200x added this to the Release 2023.04 milestone Apr 25, 2023

makefiles/utils/strings.mk: Fix version_is_greater_or_equal #19133

makefiles/utils/strings.mk: Fix version_is_greater_or_equal #19133

Uh oh!

Conversation

maribu commented Jan 12, 2023

Contribution description

Testing procedure

Issues/PRs references

Uh oh!

riot-ci commented Jan 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Murdock results

Artifacts

Uh oh!

kaspar030 left a comment

Choose a reason for hiding this comment

Uh oh!

maribu commented Jan 12, 2023

Uh oh!

bors bot commented Jan 12, 2023

Uh oh!

maribu commented Jan 12, 2023

Uh oh!

bors bot commented Jan 12, 2023

Uh oh!

maribu commented Jan 12, 2023

Uh oh!

bors bot commented Jan 12, 2023

Uh oh!

maribu commented Jan 12, 2023

Uh oh!

maribu commented Jan 12, 2023

Uh oh!

bors bot commented Jan 12, 2023

Uh oh!

maribu commented Jan 12, 2023

Uh oh!

bors bot commented Jan 12, 2023

Uh oh!

bors bot commented Jan 12, 2023

Uh oh!

bors bot commented Jan 12, 2023

Uh oh!

maribu commented Jan 12, 2023

Uh oh!

bors bot commented Jan 12, 2023

Uh oh!

maribu commented Jan 12, 2023

Uh oh!

maribu commented Jan 12, 2023

Uh oh!

Uh oh!

riot-ci commented Jan 12, 2023 •

edited

Loading