<html><head></head><body>Hi,<br><br>Why is this not handled in the same manner and location as the other cross-tools?<br><br><div class="gmail_quote">Le 31 janvier 2020 10:57:29 GMT+02:00, Steve Lhomme <robux4@ycbcr.xyz> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">And use it for all contribs detection and building.<br><br>The PKG_CONFIG is not written in the Makefile and can be overriden in config.mak<hr> contrib/bootstrap | 17 +++++++++++++++++<br> contrib/src/main.mak | 6 ++----<br> 2 files changed, 19 insertions(+), 4 deletions(-)<br><br>diff --git a/contrib/bootstrap b/contrib/bootstrap<br>index 5ed5f6f25d3..4472837e27b 100755<br>--- a/contrib/bootstrap<br>+++ b/contrib/bootstrap<br>@@ -160,6 +160,22 @@ then<br> PREFIX="${PREFIX%/}"<br> fi<br> <br>+printf "Using pkg-config... "<br>+PKG_CONFIG=`which pkg-config`<br>+PKG_CONFIG_PROG="$HOST-pkg-config"<br>+if test -z "`which $PKG_CONFIG_PROG`"<br>+then<br>+ PKG_CONFIG_PROG="pkg-config"<br>+ if test -z "`which $PKG_CONFIG_PROG`"<br>+ then<br>+ PKG_CONFIG_PROG=""<br>+ fi<br>+fi<br>+if test -n "$PKG_CONFIG_PROG"<br>+then<br>+ echo "$PKG_CONFIG_PROG"<br>+fi<br>+<br> #<br> # Prepare files<br> #<br>@@ -171,6 +187,7 @@ cat >&3 << EOF<br> # Any change will be overwritten if ../bootstrap is run again.<br> BUILD := $BUILD<br> HOST := $HOST<br>+PKG_CONFIG := $PKG_CONFIG_PROG<br> PKGS_DISABLE := $PKGS_DISABLE<br> PKGS_ENABLE := $PKGS_ENABLE<br> EOF<br>diff --git a/contrib/src/main.mak b/contrib/src/main.mak<br>index 275188ee18c..3d6a9de41a8 100644<br>--- a/contrib/src/main.mak<br>+++ b/contrib/src/main.mak<br>@@ -224,7 +224,6 @@ export ACLOCAL_AMFLAGS<br> # Tools #<br> #########<br> <br>-PKG_CONFIG ?= pkg-config<br> ifdef HAVE_CROSS_COMPILE<br> # This inhibits .pc file from within the cross-compilation toolchain sysroot.<br> # Hopefully, nobody ever needs that.<br>@@ -315,7 +314,8 @@ endif<br> HOSTTOOLS := \<br> CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \<br> AR="$(AR)" CCAS="$(CCAS)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \<br>- PATH="$(PREFIX)/bin:$(PATH)"<br>+ PATH="$(PREFIX)/bin:$(PATH)" \<br>+ PKG_CONFIG="$(PKG_CONFIG)"<br> <br> HOSTVARS_MESON := $(HOSTTOOLS) \<br> CPPFLAGS="$(CPPFLAGS)" \<br>@@ -608,7 +608,6 @@ endif<br> ifdef HAVE_CROSS_COMPILE<br> echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> $@<br> echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> $@<br>- echo "set(PKG_CONFIG_EXECUTABLE $(PKG_CONFIG))" >> $@<br> endif<br> <br> MESON_SYSTEM_NAME =<br>@@ -634,7 +633,6 @@ endif<br> crossfile.meson: $(SRC)/gen-meson-crossfile.py<br> $(HOSTVARS_MESON) \<br> WINDRES="$(WINDRES)" \<br>- PKG_CONFIG="$(PKG_CONFIG)" \<br> HOST_SYSTEM="$(MESON_SYSTEM_NAME)" \<br> HOST_ARCH="$(subst i386,x86,$(ARCH))" \<br> HOST="$(HOST)" \</pre></blockquote></div><br>-- <br>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>