[PATCH] Support zlib in the Windows build (enables latency histogram logging)

[PATCH] Support zlib in the Windows build (enables latency histogram logging)

[Rebecca Cran]

[-- Attachment #1: Type: text/plain, Size: 111 bytes --]

Add support for building with zlib in the Windows build: this enables 
the latency histogram logging feature.


[-- Attachment #2: 0001-Support-zlib-in-the-Windows-build-enabled-latency-hi.patch --]
[-- Type: text/plain, Size: 1641 bytes --]

From 3c8555a5ccf3cd4887d076944bf88f9679ab503a Mon Sep 17 00:00:00 2001
From: Rebecca Cran <bruce.cran@sandisk.com>
Date: Mon, 9 Jan 2017 21:45:38 +0000
Subject: [PATCH] Support zlib in the Windows build (enabled latency histogram
 logging)

---
 configure | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 7de88f8..866842c 100755
--- a/configure
+++ b/configure
@@ -281,8 +281,18 @@ CYGWIN*)
   if test -z "$CC" ; then
     if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then
       CC="i686-w64-mingw32-gcc"
+      if test -e "../zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib"; then
+        echo "Building with zlib support"
+        output_sym "CONFIG_ZLIB"
+        echo "LIBS=../zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib" >> $config_host_mak
+      fi
     else
       CC="x86_64-w64-mingw32-gcc"
+      if test -e "../zlib/contrib/vstudio/vc14/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib"; then
+        echo "Building with zlib support"
+        output_sym "CONFIG_ZLIB"
+        echo "LIBS=../zlib/contrib/vstudio/vc14/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib" >> $config_host_mak
+      fi
     fi
   fi
   output_sym "CONFIG_LITTLE_ENDIAN"
@@ -306,7 +316,8 @@ CYGWIN*)
   output_sym "CONFIG_TLS_THREAD"
   output_sym "CONFIG_IPV6"
   echo "CC=$CC" >> $config_host_mak
-  echo "BUILD_CFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
+  echo "BUILD_CFLAGS=$CFLAGS -I../zlib -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
+
   exit 0
   ;;
 esac
-- 
2.9.3.windows.2

Re: [PATCH] Support zlib in the Windows build (enables latency histogram logging)

[Jens Axboe]

On Mon, Jan 09 2017, Rebecca Cran wrote:
> Add support for building with zlib in the Windows build: this enables the
> latency histogram logging feature.

Thanks Rebecca, applied.

-- 
Jens Axboe

Re: [PATCH] Support zlib in the Windows build (enables latency histogram logging)

[Rebecca Cran]

On 1/11/2017 9:04 PM, Jens Axboe wrote:
> On Mon, Jan 09 2017, Rebecca Cran wrote:
>> Add support for building with zlib in the Windows build: this enables the
>> latency histogram logging feature.
> Thanks Rebecca, applied.

I don't see the changeset in the log: do you still need to push it?

-- 
Rebecca

Re: [PATCH] Support zlib in the Windows build (enables latency histogram logging)

[Jens Axboe]

On 01/12/2017 10:01 AM, Rebecca Cran wrote:
> On 1/11/2017 9:04 PM, Jens Axboe wrote:
>> On Mon, Jan 09 2017, Rebecca Cran wrote:
>>> Add support for building with zlib in the Windows build: this enables the
>>> latency histogram logging feature.
>> Thanks Rebecca, applied.
> 
> I don't see the changeset in the log: do you still need to push it?

I did, pushed now.

-- 
Jens Axboe