X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmsys2%2Fsigrok-native-msys2;h=bb692db82dc30a48bef78bc6e389c14ed503de9c;hb=6e6c47d09ae6db8568ecb3aa5b053271b26e4769;hp=c3c1c47e53fb41c08613ba65dab3dcfbd825ef51;hpb=9dcc756ada6eb105ea41a56b06103a4a76a528fc;p=sigrok-util.git diff --git a/cross-compile/msys2/sigrok-native-msys2 b/cross-compile/msys2/sigrok-native-msys2 index c3c1c47..bb692db 100755 --- a/cross-compile/msys2/sigrok-native-msys2 +++ b/cross-compile/msys2/sigrok-native-msys2 @@ -79,9 +79,12 @@ fi PYPATH=$PREFIX/$PYBASE +# Eliminate the host Python path environment variable, if any is set. +export PYTHONPATH= + # ----------------------------------------------------------------------------- -P="$PREFIX/lib/pkgconfig" +P="$PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" C="$C --prefix=$PREFIX" L="--disable-shared --enable-static" @@ -106,7 +109,8 @@ if [ "x$1" = "xprepare" ]; then autoconf automake autoconf-archive libtool make pkg-config wget patch \ $W-toolchain $W-glib2 $W-glibmm $W-libusb $W-libftdi $W-check $W-boost \ $W-libzip $W-doxygen $W-python3 $W-python3-numpy $W-python3-gobject \ - $W-python3-setuptools $W-swig $W-qt5-static $W-cmake $W-nsis + $W-python3-setuptools $W-swig $W-qt5-static $W-cmake $W-nsis \ + $W-hidapi exit fi