tool
/
starrocks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Enhancement] patching flatbuffers CMakeLists.txt (#54579) 

Signed-off-by: Kevin Xiaohua Cai <caixiaohua@starrocks.com>
This commit is contained in:
Kevin Cai 2025-01-02 16:07:32 +08:00 committed by GitHub
parent 71f6649ab7
commit f0568fdfd0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
thirdparty/build-thirdparty.sh vendored
View File

@ -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() {

11
thirdparty/download-thirdparty.sh vendored
View File

@ -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

15
thirdparty/patches/flat-buffers-1.10.0-no-stringop-overread.patch vendored Normal file
View File

@ -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()