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

contrib: add the contrib native tools to the PATH 

Some native tools we build may be usable by other targets.

When looking if a tool comes from the system we don't use our binary
folder so we rebuild it when its dependencies change or it needs a full rebuild.
This commit is contained in:
Steve Lhomme 2024-04-17 08:48:14 +02:00
parent d3f97935d6
commit fe47c2f2d6
6 changed files with 11 additions and 9 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 $(HOST)-luac -v 2>/dev/null | head -1 | sed -E 's/Lua ([0-9]+).([0-9]+).*/\1.\2/'),$(LUA_SHORTVERSION))
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))
PKGS_FOUND += luac
endif
ifeq ($(shell $(HOST)-luac -v 2>/dev/null | head -1 | sed -E 's/Lua ([0-9]+).([0-9]+).*/\1.\2/'),5.2)
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)
PKGS_FOUND += luac
endif

8
contrib/src/main.mak
View File

@ -12,9 +12,6 @@ VLC_TOOLS ?= $(TOPSRC)/../extras/tools/build
CMAKE_GENERATOR ?= Ninja
PATH :=$(abspath $(VLC_TOOLS)/bin):$(PATH)
export PATH
PKGS_ALL := $(patsubst $(SRC)/%/rules.mak,%,$(wildcard $(SRC)/*/rules.mak))
DATE := $(shell date +%Y%m%d)
VPATH := $(TARBALLS)
@ -41,6 +38,11 @@ PREFIX := $(abspath $(PREFIX))
BUILDPREFIX ?= $(PREFIX)/..
BUILDPREFIX := $(abspath $(BUILDPREFIX))
BUILDBINDIR ?= $(BUILDPREFIX)/bin
SYSTEM_PATH := $(abspath $(VLC_TOOLS)/bin):$(PATH)
PATH :=$(abspath $(BUILDBINDIR)):$(SYSTEM_PATH)
export PATH
ifneq ($(HOST),$(BUILD))
HAVE_CROSS_COMPILE = 1
endif

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

@ -20,7 +20,7 @@ endif
endif
PKGS.tools.protoc.path = $(BUILDBINDIR)/protoc
ifeq ($(shell protoc --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(PROTOBUF_MAJVERSION))
ifeq ($(shell PATH="${SYSTEM_PATH}" protoc --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(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 qt-cmake --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),3.22)
ifeq ($(shell PATH="${SYSTEM_PATH}" qt-cmake --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),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 qml --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(QTDECLARATIVE_VERSION_MAJOR))
ifeq ($(shell PATH="${SYSTEM_PATH}" qml --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(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 qsb --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(QTSHADERTOOLS_VERSION_MAJOR))
ifeq ($(shell PATH="${SYSTEM_PATH}" qsb --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(QTSHADERTOOLS_VERSION_MAJOR))
PKGS_FOUND += qtshadertools-tools
endif