Collected build fixes (p4-ovs branch)

Makefile.am

@@ -24,7 +24,8 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --with-bmv2 --with-fe-cpp
 # ensure the distribution of the doxygen configuration file
 EXTRA_DIST = $(top_srcdir)/docs/doxygen.cfg \
 	     $(top_srcdir)/docs/bfn_latex.sty \
-	     $(top_srcdir)/docs/*.md
+	     $(top_srcdir)/docs/*.md \
+	     autogen.sh
 
 mostlyclean-local:
 	-$(RM) -r $(DX_CLEANFILES)

configure.ac

@@ -2,9 +2,9 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([PI], [0.1], [[email protected]])
+AC_INIT([p4lang-pi], [0.1], [[email protected]])
 AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_INIT_AUTOMAKE([1.9 tar-pax foreign subdir-objects])
 AC_CONFIG_HEADERS([config.h])
 
 AC_PROG_CC
@@ -184,13 +184,14 @@ AC_MSG_RESULT([$CLANG])
 # Enable all warnings. -Wno-tautological-constant-out-of-range-compare is
 # necessary because clang is excessively aggressive with this warning and
 # complains about some reasonable assertions.
-EXTRA_CFLAGS="-Wall -Wextra"
+EXTRA_CFLAGS="-Wall -Wextra -Wno-deprecated-declarations"
+EXTRA_CPPFLAGS="-Wno-deprecated-declarations"
 AS_IF([test "$enable_Werror" = "yes"], [EXTRA_CFLAGS="$EXTRA_CFLAGS -Werror"])
 AS_IF([test "x$CLANG" = "xyes"],
       [EXTRA_CFLAGS="$EXTRA_CFLAGS -Wno-tautological-constant-out-of-range-compare"])
 AC_SUBST([AM_CFLAGS], ["$PTHREAD_CFLAGS $EXTRA_CFLAGS"])
 
-AC_SUBST([AM_CPPFLAGS], ["-DPI_LOG_ON -isystem$INCLUDE_DIR"])
+AC_SUBST([AM_CPPFLAGS], ["$EXTRA_CPPFLAGS -DPI_LOG_ON -isystem$INCLUDE_DIR"])
 AC_SUBST([AM_LDFLAGS], ["-L$LIB_DIR"])
 
 # Generate makefiles

proto/frontend/src/device_mgr.cpp

@@ -2082,7 +2082,7 @@ class DeviceMgrImp {
       case p4v1::StreamMessageRequest::kArbitration:
         // must be handled by server code
         RETURN_ERROR_STATUS(
-            Code::INTERNAL, "Arbitration mesages must be handled by server");
+            Code::INTERNAL, "Arbitration messages must be handled by server");
       case p4v1::StreamMessageRequest::kPacket:
         return packet_io.packet_out_send(request.packet(), stream_error);
       case p4v1::StreamMessageRequest::kDigestAck:

proto/server/Makefile.am

@@ -11,7 +11,7 @@ if WITH_SYSREPO
 AM_CPPFLAGS += -DWITH_SYSREPO
 endif
 
-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall -Werror -Wno-deprecated-declarations
 
 lib_LTLIBRARIES = libpigrpcserver.la
 

proto/server/PI/proto/pi_server.h

@@ -20,6 +20,7 @@
 
 #pragma once
 
+#include "stddef.h"
 #include "stdint.h"
 
 #ifdef __cplusplus

targets/bmv2/configure.ac

@@ -55,7 +55,7 @@ AC_TYPE_SIZE_T
 EXTRA_CXXFLAGS="-Wall -Wextra"
 AS_IF([test "$enable_Werror" = "yes"], [EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -Werror"])
 
-AC_SUBST([AM_CPPFLAGS], ["-isystem$INCLUDE_DIR"])
+AC_SUBST([AM_CPPFLAGS], ["-I$INCLUDE_DIR"])
 AC_SUBST([AM_LDFLAGS], ["-L$LIB_DIR"])
 AC_SUBST([AM_CXXFLAGS], ["$PTHREAD_CFLAGS $EXTRA_CXXFLAGS"])
 AC_SUBST([AM_CFLAGS], ["$PTHREAD_CFLAGS"])

targets/bmv2/conn_mgr.cpp

@@ -45,7 +45,7 @@ using namespace ::apache::thrift::transport;  // NOLINT(build/namespaces)
 namespace pibmv2 {
 
 struct ClientImp {
-  ::stdcxx::shared_ptr<TTransport> transport{nullptr};
+  std::shared_ptr<TTransport> transport{nullptr};
   std::unique_ptr<StandardClient> client{nullptr};
   std::unique_ptr<SimplePreLAGClient> mc_client{nullptr};
   std::mutex mutex{};
@@ -70,14 +70,14 @@ int conn_mgr_client_init(conn_mgr_t *conn_mgr_state, dev_id_t dev_id,
   assert(conn_mgr_state->clients.find(dev_id) == conn_mgr_state->clients.end());
   auto &client = conn_mgr_state->clients[dev_id];  // construct
 
-  ::stdcxx::shared_ptr<TTransport> socket(
+  std::shared_ptr<TTransport> socket(
       new TSocket("localhost", thrift_port_num));
-  ::stdcxx::shared_ptr<TTransport> transport(new TBufferedTransport(socket));
-  ::stdcxx::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
+  std::shared_ptr<TTransport> transport(new TBufferedTransport(socket));
+  std::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
 
-  ::stdcxx::shared_ptr<TMultiplexedProtocol> standard_protocol(
+  std::shared_ptr<TMultiplexedProtocol> standard_protocol(
       new TMultiplexedProtocol(protocol, "standard"));
-  ::stdcxx::shared_ptr<TMultiplexedProtocol> mc_protocol(
+  std::shared_ptr<TMultiplexedProtocol> mc_protocol(
       new TMultiplexedProtocol(protocol, "simple_pre_lag"));
 
   try {