[trafficserver] branch master updated: Fixes the Brotli build issues

[zwoop]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 140add0  Fixes the Brotli build issues
140add0 is described below

commit 140add06850374eaa2369edd3edf645d12455d75
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Mon Apr 15 18:58:46 2019 -0600

    Fixes the Brotli build issues
---
 src/traffic_layout/Makefile.inc | 2 +-
 src/traffic_layout/info.cc      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/traffic_layout/Makefile.inc b/src/traffic_layout/Makefile.inc
index afdc314..fd37a51 100644
--- a/src/traffic_layout/Makefile.inc
+++ b/src/traffic_layout/Makefile.inc
@@ -29,7 +29,7 @@ traffic_layout_traffic_layout_CPPFLAGS = \
 
 traffic_layout_traffic_layout_LDFLAGS =        \
     $(AM_LDFLAGS) \
-    @YAMLCPP_LDFLAGS@
+    @YAMLCPP_LDFLAGS@ $(BROTLIENC_LIB)
 
 traffic_layout_traffic_layout_SOURCES = \
        traffic_layout/traffic_layout.cc \
diff --git a/src/traffic_layout/info.cc b/src/traffic_layout/info.cc
index 74af91f..184049d 100644
--- a/src/traffic_layout/info.cc
+++ b/src/traffic_layout/info.cc
@@ -199,7 +199,7 @@ produce_versions(bool json)
   print_var("lzma", undef, json);
 #endif
 #if HAVE_BROTLI_ENCODE_H
-  print_var("lzma", LBW().print("{}", BrotliEncoderVersion).view(), json);
+  print_var("brotli", LBW().print("{:#x}", BrotliEncoderVersion()).view(), 
json);
 #else
   print_var("brotli", undef, json);
 #endif