From: Uwe Hermann <redacted>
Date: Fri, 21 Aug 2015 06:43:23 +0000 (+0200)
Subject: sigrok-cross-mingw: Update patch to match recent changes.
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=commitdiff_plain;h=a50faaee2c575aac079b3cd0b6b4280a407b7544

sigrok-cross-mingw: Update patch to match recent changes.
---

diff --git a/cross-compile/mingw/libsigrok_firmwaredir.patch b/cross-compile/mingw/libsigrok_firmwaredir.patch
index d9d351a..6299afe 100644
--- a/cross-compile/mingw/libsigrok_firmwaredir.patch
+++ b/cross-compile/mingw/libsigrok_firmwaredir.patch
@@ -1,13 +1,13 @@
 diff --git a/configure.ac b/configure.ac
-index cbe91cf..447c7e2 100644
+index dc4771e..a1274a2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -543,7 +543,7 @@ AC_TYPE_SIZE_T
- # Checks for library functions.
- AC_CHECK_FUNCS([gettimeofday memset strchr strcspn strdup strerror strncasecmp strstr strtol strtoul strtoull])
+@@ -484,7 +484,7 @@ AC_SEARCH_LIBS([pow], [m])
+ # We need to link against the Winsock2 library for SCPI over TCP.
+ AS_CASE([$host], [*mingw*], [LIBS="$LIBS -lws2_32"])
  
--AC_SUBST(FIRMWARE_DIR, "$datadir/sigrok-firmware")
-+AC_SUBST(FIRMWARE_DIR, "firmware")
- AC_SUBST(MAKEFLAGS, '--no-print-directory')
- AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
+-AC_SUBST([FIRMWARE_DIR], ['$(datadir)/sigrok-firmware'])
++AC_SUBST([FIRMWARE_DIR], ['firmware'])
+ AC_SUBST([MAKEFLAGS], ['--no-print-directory'])
+ AC_SUBST([AM_LIBTOOLFLAGS], ['--silent'])