From 323549e82f0604400b487ec6cfa5d2640a20b6ee Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Thu, 12 Feb 2026 20:40:32 +0100 Subject: [PATCH] Prevent build from falling back to system libs Ensure that if a file or function is not found, the build does not attempt to use system libraries. Falling back could result in using libraries that are incompatible due to wrong versions or features. PR #6671 --- release/build_linux.sh | 5 ++++- release/build_macos.sh | 5 ++++- release/build_windows.sh | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/release/build_linux.sh b/release/build_linux.sh index 6bca6979..e83d355e 100755 --- a/release/build_linux.sh +++ b/release/build_linux.sh @@ -22,9 +22,12 @@ app/deps/libusb.sh linux native static DEPS_INSTALL_DIR="$PWD/app/deps/work/install/linux-native-static" ADB_INSTALL_DIR="$PWD/app/deps/work/install/adb-linux" +# Never fall back to system libs +unset PKG_CONFIG_PATH +export PKG_CONFIG_LIBDIR="$DEPS_INSTALL_DIR/lib/pkgconfig" + rm -rf "$LINUX_BUILD_DIR" meson setup "$LINUX_BUILD_DIR" \ - --pkg-config-path="$DEPS_INSTALL_DIR/lib/pkgconfig" \ -Dc_args="-I$DEPS_INSTALL_DIR/include" \ -Dc_link_args="-L$DEPS_INSTALL_DIR/lib" \ --buildtype=release \ diff --git a/release/build_macos.sh b/release/build_macos.sh index 8f4beb9b..d6f1a56a 100755 --- a/release/build_macos.sh +++ b/release/build_macos.sh @@ -22,9 +22,12 @@ app/deps/libusb.sh macos native static DEPS_INSTALL_DIR="$PWD/app/deps/work/install/macos-native-static" ADB_INSTALL_DIR="$PWD/app/deps/work/install/adb-macos" +# Never fall back to system libs +unset PKG_CONFIG_PATH +export PKG_CONFIG_LIBDIR="$DEPS_INSTALL_DIR/lib/pkgconfig" + rm -rf "$MACOS_BUILD_DIR" meson setup "$MACOS_BUILD_DIR" \ - --pkg-config-path="$DEPS_INSTALL_DIR/lib/pkgconfig" \ -Dc_args="-I$DEPS_INSTALL_DIR/include" \ -Dc_link_args="-L$DEPS_INSTALL_DIR/lib" \ --buildtype=release \ diff --git a/release/build_windows.sh b/release/build_windows.sh index eb821a95..5bf1d67f 100755 --- a/release/build_windows.sh +++ b/release/build_windows.sh @@ -29,9 +29,12 @@ app/deps/libusb.sh $WINXX cross shared DEPS_INSTALL_DIR="$PWD/app/deps/work/install/$WINXX-cross-shared" ADB_INSTALL_DIR="$PWD/app/deps/work/install/adb-windows" +# Never fall back to system libs +unset PKG_CONFIG_PATH +export PKG_CONFIG_LIBDIR="$DEPS_INSTALL_DIR/lib/pkgconfig" + rm -rf "$WINXX_BUILD_DIR" meson setup "$WINXX_BUILD_DIR" \ - --pkg-config-path="$DEPS_INSTALL_DIR/lib/pkgconfig" \ -Dc_args="-I$DEPS_INSTALL_DIR/include" \ -Dc_link_args="-L$DEPS_INSTALL_DIR/lib" \ --cross-file=cross_$WINXX.txt \