Changes needed for centos9 build.

noironetworks · May 20, 2023 · 90c4374 · 90c4374
1 parent 533b064
commit 90c4374
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/agent-ovs/Makefile.am b/agent-ovs/Makefile.am
@@ -17,7 +17,7 @@ OVS_ADDL_CFLAGS = \
 	-D__STDC_CONSTANT_MACROS
 
 AM_CPPFLAGS = $(BOOST_CPPFLAGS) \
-	-Wall -Werror \
+	-Wall -Wno-maybe-uninitialized -Werror \
 	-I$(top_srcdir)/lib/include \
 	-DLOCALSTATEDIR='"$(localstatedir)"'
 if ENABLE_TSAN

diff --git a/agent-ovs/lib/include/opflexagent/LearningBridgeManager.h b/agent-ovs/lib/include/opflexagent/LearningBridgeManager.h
@@ -150,7 +150,7 @@ class LearningBridgeManager : private boost::noncopyable {
          * true if lhs.first < rhs.first
          */
         constexpr bool operator()(const vlan_range_t& lhs,
-                                  const vlan_range_t& rhs) {
+                                  const vlan_range_t& rhs) const {
             return lhs.first < rhs.first;
         }
     };

diff --git a/agent-ovs/ovs/PacketInHandler.cpp b/agent-ovs/ovs/PacketInHandler.cpp
@@ -10,7 +10,7 @@
  */
 
 #include <netinet/ip.h>
-#include <linux/icmp.h>
+#include <netinet/ip_icmp.h>
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 

diff --git a/agent-ovs/ovs/test/PacketInHandler_test.cpp b/agent-ovs/ovs/test/PacketInHandler_test.cpp
@@ -9,7 +9,7 @@
  */
 
 #include <netinet/ip.h>
-#include <linux/icmp.h>
+#include <netinet/ip_icmp.h>
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 #include <openvswitch/ofp-msgs.h>

diff --git a/libopflex/Makefile.am b/libopflex/Makefile.am
@@ -12,7 +12,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS = -Wall -Werror -std=c++11
+AM_CPPFLAGS = -Wall -Wno-sign-compare --Werror -std=c++11
 
 if ENABLE_TSAN
   AM_CPPFLAGS += -fsanitize=thread

diff --git a/libopflex/comms/transport/ZeroCopyOpenSSL.cpp b/libopflex/comms/transport/ZeroCopyOpenSSL.cpp
@@ -440,10 +440,10 @@ int ZeroCopyOpenSSL::initOpenSSL(bool forMultipleThreads) {
     }
     SSL_library_init();
     SSL_load_error_strings();
+    ERR_load_SSL_strings();
 #else
    OPENSSL_init_ssl(0, NULL);
 #endif
-    ERR_load_SSL_strings();
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     OpenSSL_add_all_algorithms();
     if (forMultipleThreads) {