Use patch instead of sed to apply hack to pulseview link flags.

[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 e3bc71fc79855b048d0c017ee194f04b4e176f3a..c2cf88baafbc04638a8da6ef4abc654d06b0b1bf 100755 (executable)
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -105,15 +105,14 @@ git clone git://sigrok.org/sigrok-cli
 cd sigrok-cli
 ./autogen.sh
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install
-makensis contrib/sigrok-cli_cross.nsi
+makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi
 cd ..
 
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-# Temporary workaround: append (not prepend) "-llzma -llcms2" to the linker.
-sed -i '247a \\tlist(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") # Quick hack' CMakeLists.txt
+patch -p1 < ../../pulseview.patch
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y . && make install VERBOSE=1
-makensis contrib/pulseview_cross.nsi
+makensis -DHOME=$HOME contrib/pulseview_cross.nsi
 cd ..