sigrok-cross-mingw: Drop obsolete linking fix.
authorUwe Hermann <uwe@hermann-uwe.de>
Tue, 28 Jan 2014 17:08:33 +0000 (18:08 +0100)
committerUwe Hermann <uwe@hermann-uwe.de>
Tue, 28 Jan 2014 17:08:33 +0000 (18:08 +0100)
This is now included in mainline PulseView.

cross-compile/mingw/pulseview_linkfix.patch [deleted file]
cross-compile/mingw/sigrok-cross-mingw

diff --git a/cross-compile/mingw/pulseview_linkfix.patch b/cross-compile/mingw/pulseview_linkfix.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})
index 33da4cb7ecee8c2b9c6574564ba8a74315181625..a287e1a589c54bc9c085379419f85f35ffbfa897 100755 (executable)
@@ -163,7 +163,6 @@ cd ..
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-patch -p1 < ../../pulseview_linkfix.patch
 patch -p1 < ../../pulseview_decodersdir.patch
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_DECODE=y -DENABLE_COTIRE=y .
 make $PARALLEL VERBOSE=1