[vlc-commits] contrib: always use $(PKG_CONFIG) to find available dependencies

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Feb 14 11:53:39 2020 +0100| [b0f13fc824b385c4e169684918b4d145a73ffbc4] | committer: Steve Lhomme

contrib: always use $(PKG_CONFIG) to find available dependencies

When cross-compiling the PKG_CONFIG is either forced by the environment, to find
what the user wants us to find, or we detect a usable one and set common system
pathes where we might find usable packages.

It's possible to disable the use of PKG_CONFIG like it used to be by setting
PKG_CONFIG=false in the environment, when building contribs.

We make sure PKG_CONFIG_LIBDIR is used when we set its value.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b0f13fc824b385c4e169684918b4d145a73ffbc4
---

 contrib/src/main.mak | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index bff9cd8241..d48c1d72a8 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -45,15 +45,7 @@ ifeq ($(ARCH)-$(HAVE_WIN32),aarch64-1)
 HAVE_WIN64 := 1
 endif
 
-ifdef HAVE_CROSS_COMPILE
-need_pkg = 1
-else
-ifeq ($(findstring mingw32,$(BUILD)),mingw32)
-need_pkg = $(shell PKG_CONFIG_LIBDIR="${PKG_CONFIG_PATH}" $(PKG_CONFIG) $(1) || echo 1)
-else
 need_pkg = $(shell $(PKG_CONFIG) $(1) || echo 1)
-endif
-endif
 
 ifeq ($(findstring mingw32,$(BUILD)),mingw32)
 MSYS_BUILD := 1
@@ -114,6 +106,7 @@ else
 PKG_CONFIG_LIBDIR := /usr/$(HOST)/lib/pkgconfig:/usr/lib/$(HOST)/pkgconfig
 endif
 export PKG_CONFIG_LIBDIR
+need_pkg = $(shell PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) $(PKG_CONFIG) $(1) || echo 1)
 endif
 
 endif