Rename pulseview.patch to pulseview_linkfix.patch.
authorUwe Hermann <uwe@hermann-uwe.de>
Wed, 1 Jan 2014 19:15:38 +0000 (20:15 +0100)
committerUwe Hermann <uwe@hermann-uwe.de>
Wed, 1 Jan 2014 19:15:38 +0000 (20:15 +0100)
cross-compile/mingw/pulseview.patch [deleted file]
cross-compile/mingw/pulseview_linkfix.patch [new file with mode: 0644]
cross-compile/mingw/sigrok-cross-mingw

diff --git a/cross-compile/mingw/pulseview.patch b/cross-compile/mingw/pulseview.patch
deleted file mode 100644 (file)
index e80207e..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 443dea6..7b91e0b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -250,6 +250,7 @@ set(PULSEVIEW_LINK_LIBS
- if(STATIC_PKGDEPS_LIBS)
-       link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
-       list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
-+      list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") # Quick hack
- else()
-       link_directories(${PKGDEPS_LIBRARY_DIRS})
-       list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
diff --git a/cross-compile/mingw/pulseview_linkfix.patch b/cross-compile/mingw/pulseview_linkfix.patch
new file mode 100644 (file)
index 0000000..e80207e
--- /dev/null
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 443dea6..7b91e0b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -250,6 +250,7 @@ set(PULSEVIEW_LINK_LIBS
+ if(STATIC_PKGDEPS_LIBS)
+       link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
+       list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
++      list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") # Quick hack
+ else()
+       link_directories(${PKGDEPS_LIBRARY_DIRS})
+       list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
index e401ab3441231d130a73d0bc152a24c160b3855c..b38a111f3413e078c5a0d87e97f0de61e7c45178 100755 (executable)
@@ -113,7 +113,7 @@ cd ..
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-patch -p1 < ../../pulseview.patch
+patch -p1 < ../../pulseview_linkfix.patch
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y . && make install VERBOSE=1
 makensis -DHOME=$HOME contrib/pulseview_cross.nsi
 cd ..