mirror of
https://github.com/Genymobile/scrcpy.git
synced 2026-04-11 14:21:49 +08:00
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 <https://github.com/Genymobile/scrcpy/pull/6671>
This commit is contained in:
parent
90d11810e3
commit
323549e82f
@ -22,9 +22,12 @@ app/deps/libusb.sh linux native static
|
|||||||
DEPS_INSTALL_DIR="$PWD/app/deps/work/install/linux-native-static"
|
DEPS_INSTALL_DIR="$PWD/app/deps/work/install/linux-native-static"
|
||||||
ADB_INSTALL_DIR="$PWD/app/deps/work/install/adb-linux"
|
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"
|
rm -rf "$LINUX_BUILD_DIR"
|
||||||
meson setup "$LINUX_BUILD_DIR" \
|
meson setup "$LINUX_BUILD_DIR" \
|
||||||
--pkg-config-path="$DEPS_INSTALL_DIR/lib/pkgconfig" \
|
|
||||||
-Dc_args="-I$DEPS_INSTALL_DIR/include" \
|
-Dc_args="-I$DEPS_INSTALL_DIR/include" \
|
||||||
-Dc_link_args="-L$DEPS_INSTALL_DIR/lib" \
|
-Dc_link_args="-L$DEPS_INSTALL_DIR/lib" \
|
||||||
--buildtype=release \
|
--buildtype=release \
|
||||||
|
|||||||
@ -22,9 +22,12 @@ app/deps/libusb.sh macos native static
|
|||||||
DEPS_INSTALL_DIR="$PWD/app/deps/work/install/macos-native-static"
|
DEPS_INSTALL_DIR="$PWD/app/deps/work/install/macos-native-static"
|
||||||
ADB_INSTALL_DIR="$PWD/app/deps/work/install/adb-macos"
|
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"
|
rm -rf "$MACOS_BUILD_DIR"
|
||||||
meson setup "$MACOS_BUILD_DIR" \
|
meson setup "$MACOS_BUILD_DIR" \
|
||||||
--pkg-config-path="$DEPS_INSTALL_DIR/lib/pkgconfig" \
|
|
||||||
-Dc_args="-I$DEPS_INSTALL_DIR/include" \
|
-Dc_args="-I$DEPS_INSTALL_DIR/include" \
|
||||||
-Dc_link_args="-L$DEPS_INSTALL_DIR/lib" \
|
-Dc_link_args="-L$DEPS_INSTALL_DIR/lib" \
|
||||||
--buildtype=release \
|
--buildtype=release \
|
||||||
|
|||||||
@ -29,9 +29,12 @@ app/deps/libusb.sh $WINXX cross shared
|
|||||||
DEPS_INSTALL_DIR="$PWD/app/deps/work/install/$WINXX-cross-shared"
|
DEPS_INSTALL_DIR="$PWD/app/deps/work/install/$WINXX-cross-shared"
|
||||||
ADB_INSTALL_DIR="$PWD/app/deps/work/install/adb-windows"
|
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"
|
rm -rf "$WINXX_BUILD_DIR"
|
||||||
meson setup "$WINXX_BUILD_DIR" \
|
meson setup "$WINXX_BUILD_DIR" \
|
||||||
--pkg-config-path="$DEPS_INSTALL_DIR/lib/pkgconfig" \
|
|
||||||
-Dc_args="-I$DEPS_INSTALL_DIR/include" \
|
-Dc_args="-I$DEPS_INSTALL_DIR/include" \
|
||||||
-Dc_link_args="-L$DEPS_INSTALL_DIR/lib" \
|
-Dc_link_args="-L$DEPS_INSTALL_DIR/lib" \
|
||||||
--cross-file=cross_$WINXX.txt \
|
--cross-file=cross_$WINXX.txt \
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user