sigrok-cross-mingw: Workaround for MXE/mingw Pulseview link issue.

[sigrok-util.git] / cross-compile / mingw / sigrok-cross-mingw

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index e09be7d29cac8bc997e8911f5322c45b7930597b..afc49921a9e51815a76dfc9fe063dc9d172c5b8c 100755 (executable)
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -32,12 +32,6 @@ BUILDDIR=./sr_mingw_build
 
 # -----------------------------------------------------------------------------
 
-VER_LIBUSB_1_0=1.0.9
-
-SF_MIRROR=switch.dl.sourceforge.net
-
-# -----------------------------------------------------------------------------
-
 # We need to find tools in the toolchain and in the install directory.
 export PATH=$PREFIX/bin:$MXE/usr/bin:$PATH
 
@@ -54,13 +48,6 @@ cd $BUILDDIR
 
 # -----------------------------------------------------------------------------
 
-# libusb-1.0
-wget http://$SF_MIRROR/project/libusb/libusb-1.0/libusb-$VER_LIBUSB_1_0/libusb-$VER_LIBUSB_1_0.tar.bz2
-tar xfj libusb-$VER_LIBUSB_1_0.tar.bz2
-cd libusb-$VER_LIBUSB_1_0
-./configure $C $L && make install
-cd ..
-
 # Python3
 # Cross-compiling Python is highly non-trivial, so we avoid it for now.
 # The download below is a repackaged tarball of the official Python 3.2.3 MSI
@@ -128,7 +115,8 @@ cd ..
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-# TODO: Append (not prepend) "-llzma -llcms" to the linker.
+# Temporary workaround: append (not prepend) "-llzma -llcms2" to the linker.
+sed -i '224a \\tlist(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") # Quick hack' CMakeLists.txt
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y . && make install VERBOSE=1
 cd ..