-
Notifications
You must be signed in to change notification settings - Fork 251
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
{rolling} uncrustify-vendor: Ignore uncrustify version suffix
The uncrustify package introduced a suffix for cases where the make_version.py could not run. The uncrustify-vendor CMakeLists.txt file assumes the fallback suffix is present. We make this conditional as we build uncrustify cleanly and it doesn't have the suffix. Signed-off-by: Rob Woolley <[email protected]>
- Loading branch information
1 parent
e1623e5
commit d01726d
Showing
2 changed files
with
34 additions
and
0 deletions.
There are no files selected for viewing
30 changes: 30 additions & 0 deletions
30
...bbappends/uncrustify-vendor/uncrustify-vendor/0001-ignore_uncrustify_version_suffix.patch
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
Ignore uncrustify verison suffix | ||
|
||
The uncrustify package introduced a suffix for cases where the make_version.py | ||
could not run. Thus it is the fallback version string: | ||
https://github.com/uncrustify/uncrustify/pull/1083 | ||
|
||
This is known by the maintainer cause problems with Debian as well: | ||
https://github.com/uncrustify/uncrustify/issues/2782 | ||
|
||
The uncrustify-vendor CMakeLists.txt file assumes the fallback suffix is | ||
present. We make this conditional as we build uncrustify cleanly and it | ||
doesn't have the suffix. | ||
|
||
Upstream-Status: Pending | ||
|
||
Signed-off-by: Rob Woolley <[email protected]> | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index ddbe2ba..9f5098c 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -15,7 +15,7 @@ function(check_uncrustify RESULT PROGRAM) | ||
set(${RESULT} FALSE PARENT_SCOPE) | ||
else() | ||
# Before 0.65 uncrustify used a different versioning scheme so the regex won't match | ||
- string(REGEX REPLACE "^Uncrustify(_d|)-(.*)_f$" "\\2" version_prefix_match "${out}") | ||
+ string(REGEX REPLACE "^Uncrustify(_d|)-(.*)(_f|)$" "\\2" version_prefix_match "${out}") | ||
if(NOT version_prefix_match OR version_prefix_match VERSION_LESS 0.78) | ||
set(${RESULT} FALSE PARENT_SCOPE) | ||
endif() |
4 changes: 4 additions & 0 deletions
4
meta-ros2-rolling/recipes-bbappends/uncrustify-vendor/uncrustify-vendor_%.bbappend
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,9 @@ | ||
# Copyright (c) 2024 Rethink Robotics GmbH | ||
|
||
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" | ||
|
||
SRC_URI += "file://0001-ignore_uncrustify_version_suffix.patch" | ||
|
||
ROS_BUILDTOOL_DEPENDS += " \ | ||
uncrustify-native \ | ||
" |