From 7851d3b13eae5cce298ac1831e04f41d558df807 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 17 Apr 2024 14:11:23 +0200
Subject: [PATCH] contrib: use the simplified macro to check the system tool
 versions

---
 contrib/src/lua/rules.mak           | 4 ++--
 contrib/src/protobuf/rules.mak      | 2 +-
 contrib/src/qt/rules.mak            | 2 +-
 contrib/src/qtdeclarative/rules.mak | 2 +-
 contrib/src/qtshadertools/rules.mak | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
index 5b5ecc29d6..844ea813a3 100644
--- a/contrib/src/lua/rules.mak
+++ b/contrib/src/lua/rules.mak
@@ -49,10 +49,10 @@ endif
 endif
 endif
 
-ifeq ($(shell PATH="${SYSTEM_PATH}" $(HOST)-luac -v 2>/dev/null | head -1 | sed  -E 's/Lua ([0-9]+).([0-9]+).*/\1.\2/'),$(LUA_SHORTVERSION))
+ifeq ($(call system_tool_majmin, $(HOST)-luac -v),$(LUA_SHORTVERSION))
 PKGS_FOUND += luac
 endif
-ifeq ($(shell PATH="${SYSTEM_PATH}" $(HOST)-luac -v 2>/dev/null | head -1 | sed  -E 's/Lua ([0-9]+).([0-9]+).*/\1.\2/'),5.2)
+ifeq ($(call system_tool_majmin, $(HOST)-luac -v),5.2)
 PKGS_FOUND += luac
 endif
 
diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
index bf512965ac..717d91bb37 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -20,7 +20,7 @@ endif
 endif
 PKGS.tools.protoc.path = $(BUILDBINDIR)/protoc
 
-ifeq ($(shell PATH="${SYSTEM_PATH}" protoc --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(PROTOBUF_MAJVERSION))
+ifeq ($(call system_tool_majmin, protoc --version),$(PROTOBUF_MAJVERSION))
 PKGS_FOUND += protoc
 endif
 
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index a49144ddff..25058f8df0 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -28,7 +28,7 @@ endif
 ifndef HAVE_CROSS_COMPILE
 PKGS_FOUND += qt-tools
 endif
-ifeq ($(shell PATH="${SYSTEM_PATH}" qt-cmake --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),3.22)
+ifeq ($(call system_tool_version, qt-cmake --version),3.22)
 PKGS_FOUND += qt-tools
 endif
 
diff --git a/contrib/src/qtdeclarative/rules.mak b/contrib/src/qtdeclarative/rules.mak
index b952ee4ba5..3dbc3be6f3 100644
--- a/contrib/src/qtdeclarative/rules.mak
+++ b/contrib/src/qtdeclarative/rules.mak
@@ -25,7 +25,7 @@ endif
 ifndef HAVE_CROSS_COMPILE
 PKGS_FOUND += qtdeclarative-tools
 endif
-ifeq ($(shell PATH="${SYSTEM_PATH}" qml --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(QTDECLARATIVE_VERSION_MAJOR))
+ifeq ($(call system_tool_majmin, qml --version),$(QTDECLARATIVE_VERSION_MAJOR))
 PKGS_FOUND += qtshadertools-tools
 endif
 
diff --git a/contrib/src/qtshadertools/rules.mak b/contrib/src/qtshadertools/rules.mak
index a2fa4e9563..7449de43ef 100644
--- a/contrib/src/qtshadertools/rules.mak
+++ b/contrib/src/qtshadertools/rules.mak
@@ -29,7 +29,7 @@ endif
 ifndef HAVE_CROSS_COMPILE
 PKGS_FOUND += qtshadertools-tools
 endif
-ifeq ($(shell PATH="${SYSTEM_PATH}" qsb --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(QTSHADERTOOLS_VERSION_MAJOR))
+ifeq ($(call system_tool_majmin, qsb --version),$(QTSHADERTOOLS_VERSION_MAJOR))
 PKGS_FOUND += qtshadertools-tools
 endif