mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-09 07:51:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/ola: fix protoc version checking

Browse Source 
Backport patches fixing protoc version checking.

Fixes:
checking protoc version... expr: syntax error: unexpected argument '2'
configure: error: protoc version too old libprotoc 28.1 < 2.3.0

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
James Hilliard
2025-02-05 07:07:40 -07:00
committed by Arnout Vandecappelle
parent c04f4b27c6
commit 91f3e387fd
2 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
package/ola/0002-Fix-protoc-version-checking-since-v20.x.patch Normal file
View File

@@ -0,0 +1,35 @@
From d4414feefd95adf9c91d7eaf1e94380296c35f7a Mon Sep 17 00:00:00 2001
From: Peter Newman <peternewman@users.noreply.github.com>
Date: Fri, 7 Jul 2023 15:57:35 +0100
Subject: [PATCH] Fix protoc version checking, since v20.x (cherry picked from
commit 2e55aa88756718d8ab4a4c8fde97d620542c2c98)
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Upstream: https://github.com/OpenLightingProject/ola/commit/d4414feefd95adf9c91d7eaf1e94380296c35f7a
---
config/ola.m4 | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/config/ola.m4 b/config/ola.m4
index f838ab70a..51b6c825c 100644
--- a/config/ola.m4
+++ b/config/ola.m4
@@ -44,7 +44,14 @@ if test -z "$PROTOC" ; then
AC_MSG_ERROR([cannot find 'protoc' program]);
elif test -n "$1" ; then
AC_MSG_CHECKING([protoc version])
- [protoc_version=`$PROTOC --version 2>&1 | grep 'libprotoc' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
+ # Since v20.x we only get effectively the minor and patch versions out of protoc.
+ # Treat them as major and minor and everything should keep working indefinitely.
+ # See https://protobuf.dev/support/version-support/
+ # So we've got either of these:
+ # libprotoc 2.4.1
+ # libprotoc 23.3
+ # The first sed ensures all versions have major, minor, patch, by adding a .0 on the end of ones missing it
+ [protoc_version=`$PROTOC --version 2>&1 | grep 'libprotoc' | sed 's/\([^\.0-9][0-9][0-9]*\.[0-9][0-9]*\)$/\1\.0/g' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
[required=$1]
[required_major=`echo $required | sed 's/[^0-9].*//'`]
[required_minor=`echo $required | sed 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'`]
--
2.34.1

28
package/ola/0003-Protoc-check-correctly-match-multi-digit-major-versi.patch Normal file
View File

@@ -0,0 +1,28 @@
From 546d9ee8d970c4e5b33d9d28b4acf6eb34f27a5d Mon Sep 17 00:00:00 2001
From: Peter Newman <peternewman@users.noreply.github.com>
Date: Fri, 7 Jul 2023 16:14:21 +0100
Subject: [PATCH] Protoc check - correctly match multi-digit major versions
(cherry picked from commit 69a2946622cdfce54cb6ed7f2210df2be0ec5576)
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Upstream: https://github.com/OpenLightingProject/ola/commit/546d9ee8d970c4e5b33d9d28b4acf6eb34f27a5d
---
config/ola.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/ola.m4 b/config/ola.m4
index 51b6c825c..eacee5d94 100644
--- a/config/ola.m4
+++ b/config/ola.m4
@@ -51,7 +51,7 @@ elif test -n "$1" ; then
# libprotoc 2.4.1
# libprotoc 23.3
# The first sed ensures all versions have major, minor, patch, by adding a .0 on the end of ones missing it
- [protoc_version=`$PROTOC --version 2>&1 | grep 'libprotoc' | sed 's/\([^\.0-9][0-9][0-9]*\.[0-9][0-9]*\)$/\1\.0/g' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
+ [protoc_version=`$PROTOC --version 2>&1 | grep 'libprotoc' | sed 's/\([^\.0-9][0-9][0-9]*\.[0-9][0-9]*\)$/\1\.0/g' | sed 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
[required=$1]
[required_major=`echo $required | sed 's/[^0-9].*//'`]
[required_minor=`echo $required | sed 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'`]
--
2.34.1