[Enhancement] patching flatbuffers CMakeLists.txt

Signed-off-by: Kevin Xiaohua Cai <[email protected]>

thirdparty/build-thirdparty.sh

@@ -652,18 +652,12 @@ build_flatbuffers() {
   cd $BUILD_DIR
   rm -rf CMakeCache.txt CMakeFiles/
 
-  # reset the optimization level to O2 to avoid "stringop-overread" warnings/errors
-  export CXXFLAGS="$CXXFLAGS -O2"
-  export CPPFLAGS="$CPPFLAGS -O2"
-
   LDFLAGS="-static-libstdc++ -static-libgcc" \
   ${CMAKE_CMD} .. -G "${CMAKE_GENERATOR}" -DFLATBUFFERS_BUILD_TESTS=OFF
   ${BUILD_SYSTEM} -j$PARALLEL
   cp flatc  $TP_INSTALL_DIR/bin/flatc
   cp -r ../include/flatbuffers  $TP_INCLUDE_DIR/flatbuffers
   cp libflatbuffers.a $TP_LIB_DIR/libflatbuffers.a
-
-  restore_compile_flags
 }
 
 build_brotli() {

thirdparty/download-thirdparty.sh

@@ -545,6 +545,17 @@ if [[ -d $TP_SOURCE_DIR/$BITSHUFFLE_SOURCE ]] ; then
     echo "Finished patching $BITSHUFFLE_SOURCE"
 fi
 
+# patch flatbuffers
+if [[ -d $TP_SOURCE_DIR/$FLATBUFFERS_SOURCE ]] ; then
+    cd $TP_SOURCE_DIR/$FLATBUFFERS_SOURCE
+    if [ ! -f "$PATCHED_MARK" ] && [[ $FLATBUFFERS_SOURCE == "flatbuffers-1.10.0" ]] ; then
+        patch -p1 < "$TP_PATCH_DIR/flat-buffers-1.10.0-no-stringop-overread.patch"
+        touch "$PATCHED_MARK"
+    fi
+    cd -
+    echo "Finished patching $FLATBUFFERS_SOURCE"
+fi
+
 #patch clucene
 if [[ -d $TP_SOURCE_DIR/$CLUCENE_SOURCE ]] ; then
     cd $TP_SOURCE_DIR/$CLUCENE_SOURCE

thirdparty/patches/flat-buffers-1.10.0-no-stringop-overread.patch

@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 76619dc..7603a72 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -139,6 +139,10 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
+       set(CMAKE_CXX_FLAGS
+         "${CMAKE_CXX_FLAGS} -faligned-new")
+     endif()
++    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 11.0)
++      # disable stringop-overread for gcc >= 11.0
++      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-stringop-overread")
++    endif()
+     set(CMAKE_CXX_FLAGS
+       "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result -Wunused-parameter -Werror=unused-parameter")
+   endif()