[trafficserver] branch quic-latest updated: Fix build issues on FreeBSD 11

[ma...@apache.org]

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

maskit pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/quic-latest by this push:
     new e44f61e  Fix build issues on FreeBSD 11
e44f61e is described below

commit e44f61e268b0af2921e96d398150e06001a3b9e4
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Wed Aug 16 11:05:56 2017 +0900

    Fix build issues on FreeBSD 11
---
 iocore/net/quic/QUICTypes.h |  4 +++-
 proxy/Makefile.am           | 12 +++++++++---
 proxy/hq/Makefile.am        |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/iocore/net/quic/QUICTypes.h b/iocore/net/quic/QUICTypes.h
index abff721..f01a4c7 100644
--- a/iocore/net/quic/QUICTypes.h
+++ b/iocore/net/quic/QUICTypes.h
@@ -23,10 +23,12 @@
 
 #pragma once
 
-#ifdef __APPLE__
+#if defined(darwin)
 #include <libkern/OSByteOrder.h>
 #define be64toh(x) OSSwapBigToHostInt64(x)
 #define htobe64(x) OSSwapHostToBigInt64(x)
+#elif defined(freebsd)
+#include <sys/endian.h>
 #else
 #include <endian.h>
 #endif
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 7505dc0..e2ee822 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -202,8 +202,7 @@ traffic_server_LDADD = \
 
 if ENABLE_QUIC
 traffic_server_LDADD += \
-  hq/libhq.a \
-  $(top_builddir)/iocore/net/quic/libquic.a
+  hq/libhq.a
 endif
 
 if BUILD_LUAJIT
@@ -212,7 +211,14 @@ traffic_server_LDADD += \
 endif
 
 traffic_server_LDADD += \
-  $(top_builddir)/iocore/net/libinknet.a \
+  $(top_builddir)/iocore/net/libinknet.a
+
+if ENABLE_QUIC
+traffic_server_LDADD += \
+  $(top_builddir)/iocore/net/quic/libquic.a
+endif
+
+traffic_server_LDADD += \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/records/librecords_p.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
diff --git a/proxy/hq/Makefile.am b/proxy/hq/Makefile.am
index b188de4..dc545e1 100644
--- a/proxy/hq/Makefile.am
+++ b/proxy/hq/Makefile.am
@@ -19,7 +19,7 @@
 
 include $(top_srcdir)/build/tidy.mk
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
   $(iocore_include_dirs) \
   -I$(abs_top_srcdir)/proxy/api/ts \
   -I$(abs_top_srcdir)/lib \

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].