sigrok-native-msys2: Have libsigrok Python bindings use Python 3.

[sigrok-util.git] / cross-compile / msys2 / sigrok-native-msys2

diff --git a/cross-compile/msys2/sigrok-native-msys2 b/cross-compile/msys2/sigrok-native-msys2
index 893dc926a6dbb25e9d5d6c96bc3cde9999f89c47..1e7f9fdfe1b467196da119de282e48b7fd164d96 100755 (executable)
--- a/cross-compile/msys2/sigrok-native-msys2
+++ b/cross-compile/msys2/sigrok-native-msys2
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
 set -e
@@ -59,6 +58,8 @@ W="mingw-w64-$TARGET"
 WGET="wget -c --quiet"
 GIT_CLONE="git clone --depth=1"
 
+REPO_BASE="git://sigrok.org"
+
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR
 mkdir $BUILDDIR
@@ -70,10 +71,10 @@ if [ "x$1" = "xprepare" ]; then
   # Update package list, install/update all requirements.
   pacman -Sy
   pacman -S \
-       autoconf automake libtool make pkg-config wget patch \
-       $W-toolchain $W-glib2 $W-glibmm $W-libusb $W-check $W-boost \
+       autoconf automake autoconf-archive libtool make pkg-config wget patch \
+       $W-toolchain $W-glib2 $W-glibmm $W-libusb $W-libfdi $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-python3-setuptools $W-swig $W-qt5-static $W-cmake $W-nsis
   exit
 fi
 
@@ -89,7 +90,7 @@ make install $V
 cd ..
 
 # libserialport
-$GIT_CLONE git://sigrok.org/libserialport
+$GIT_CLONE $REPO_BASE/libserialport
 cd libserialport
 ./autogen.sh
 mkdir build
@@ -101,19 +102,19 @@ cd ../..
 
 # libsigrok
 mkdir -p $PYPATH
-$GIT_CLONE git://sigrok.org/libsigrok
+$GIT_CLONE $REPO_BASE/libsigrok
 cd libsigrok
 ./autogen.sh
 mkdir build
 cd build
-PKG_CONFIG_PATH=$P ../configure $C $L --disable-python
+PKG_CONFIG_PATH=$P PYTHON=python3 ../configure $C $L --disable-python
 $SB make $PARALLEL $V
 PYTHONPATH=$PYPATH $SB make install $V
 # $SB make check $V # TODO
 cd ../..
 
 # libsigrokdecode
-$GIT_CLONE git://sigrok.org/libsigrokdecode
+$GIT_CLONE $REPO_BASE/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
 mkdir build
@@ -125,7 +126,7 @@ make install $V
 cd ../..
 
 # sigrok-firmware
-$GIT_CLONE git://sigrok.org/sigrok-firmware
+$GIT_CLONE $REPO_BASE/sigrok-firmware
 cd sigrok-firmware
 ./autogen.sh
 mkdir build
@@ -144,7 +145,7 @@ cd ..
 
 # TODO: Doesn't build, libsigrokdecode linking errors.
 # # sigrok-cli
-# $GIT_CLONE git://sigrok.org/sigrok-cli
+# $GIT_CLONE $REPO_BASE/sigrok-cli
 # cd sigrok-cli
 # ./autogen.sh
 # mkdir build
@@ -157,7 +158,7 @@ cd ..
 
 # TODO: Doesn't build, various linking errors.
 # PulseView
-$GIT_CLONE git://sigrok.org/pulseview
+$GIT_CLONE $REPO_BASE/pulseview
 cd pulseview
 mkdir build
 cd build