videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

contrib: use the simplified macro to check the system tool versions

This commit is contained in:
Steve Lhomme 2024-04-17 14:11:23 +02:00
parent 45693d54aa
commit 7851d3b13e
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/src/lua/rules.mak
View File

@ -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

2
contrib/src/protobuf/rules.mak
View File

@ -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

2
contrib/src/qt/rules.mak
View File

@ -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

2
contrib/src/qtdeclarative/rules.mak
View File

@ -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

2
contrib/src/qtshadertools/rules.mak
View File

@ -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