[vlc-devel] [PATCH 3/5] package/win32: build.sh: don't force the PKG_CONFIG_LIBDIR
Steve Lhomme
robux4 at ycbcr.xyz
Fri Feb 14 13:37:51 CET 2020
The contrib path is automatically added for contribs and for vlc.
We still need it for VLC as it uses the autotools detection which fails to
realise TRIPLET-pkg-config exists, runs but is not functional on Debian.
---
extras/package/win32/build.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index 6d782adf0dc..b3533dcdf34 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -138,7 +138,6 @@ fi
cd ../../
export USE_FFMPEG=1
-export PKG_CONFIG_LIBDIR="$PWD/contrib/$TRIPLET/lib/pkgconfig"
export PATH="$PWD/contrib/$TRIPLET/bin":"$PATH"
if [ "$INTERACTIVE" = "yes" ]; then
@@ -182,6 +181,8 @@ fi
cd ../..
info "Bootstrapping"
+# make sure the Debian TRIPLET-pkg-config doesn't pretend it works to autoconf
+export PKG_CONFIG_LIBDIR=""
${SCRIPT_PATH}/../../../bootstrap
--
2.17.1
More information about the vlc-devel
mailing list