[vlc-commits] [Git][videolan/vlc][master] contrib: detect the system provided packages without the contrib built ones

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
80ab9aa3 by Steve Lhomme at 2025-01-19T16:15:21+00:00
contrib: detect the system provided packages without the contrib built ones

The "Distribution-provided packages" of make list, a.k.a. PKGS_FOUND
is supposed to reflect what is really coming from the system,
not if it was previously built (and therefore will never be rebuilt).

- - - - -


1 changed file:

- contrib/src/main.mak


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -252,8 +252,6 @@ export ACLOCAL_PATH=${VLC_ACLOCAL_PATH}
 # Tools #
 #########
 
-need_pkg = $(shell $(PKG_CONFIG) $(1) || echo 1)
-
 ifdef HAVE_CROSS_COMPILE
 # Use pkg-config cross-tool if it actually works
 ifeq ($(shell unset PKG_CONFIG_LIBDIR; $(HOST)-pkg-config --version 1>/dev/null 2>/dev/null || echo FAIL),)
@@ -262,12 +260,14 @@ else
 # Use the regular pkg-config and set some PKG_CONFIG_LIBDIR ourselves
 PKG_CONFIG_LIBDIR ?= /usr/$(HOST)/lib/pkgconfig:/usr/lib/$(HOST)/pkgconfig:/usr/share/pkgconfig
 export PKG_CONFIG_LIBDIR
-need_pkg = $(shell PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) $(PKG_CONFIG) $(1) || echo 1)
+need_pkg = $(shell PKG_CONFIG_PATH=$(SYSTEM_PKG_CONFIG_PATH) PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) $(PKG_CONFIG) $(1) || echo 1)
 endif
 endif # HAVE_CROSS_COMPILE
 
+need_pkg ?= $(shell PKG_CONFIG_PATH=$(SYSTEM_PKG_CONFIG_PATH) $(PKG_CONFIG) $(1) || echo 1)
 PKG_CONFIG ?= pkg-config
 
+SYSTEM_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH)
 PKG_CONFIG_PATH := $(PREFIX)/lib/pkgconfig:$(PREFIX)/share/pkgconfig:$(PKG_CONFIG_PATH)
 export PKG_CONFIG_PATH
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/80ab9aa33197b89d2dc06ab4a2e2a5ddc22d0cf1

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/80ab9aa33197b89d2dc06ab4a2e2a5ddc22d0cf1
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance