适配旧世界编译

1. 使用deps 目录下的工具链, 使用静态连接
2. 注释打包 oceanbase-devel , 打包devel 会编译 obcdc，而obcdc会连接报错

CMakeLists.txt

@@ -65,9 +65,6 @@ cmake_dependent_option(
   "NOT OB_BUILD_RPM;NOT OB_BUILD_LIBOBLOG" ON
 )
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcmodel=large")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcmodel=large")
-
 message(STATUS "This is BINARY dir " ${PROJECT_BINARY_DIR})
 message(STATUS "This is SOURCE dir " ${PROJECT_SOURCE_DIR})
 

cmake/Env.cmake

@@ -155,7 +155,7 @@ elseif(${ARCHITECTURE} STREQUAL "aarch64")
     set(MTUNE_CFLAGS "-mtune=generic" )
     set(ARCH_LDFLAGS "-l:libatomic.a")
 elseif(${ARCHITECTURE} STREQUAL "loongarch64")
-    set(MARCH_CFLAGS "-march=la464")
+    set(MARCH_CFLAGS "-march=la464" "-mcmodel=large")
     set(MTUNE_CFLAGS "-mabi=lp64")
     set(ARCH_LDFLAGS "-l:libatomic.a")
 elseif(${ARCHITECTURE} STREQUAL "sw_64")

cmake/RPM.cmake

@@ -59,67 +59,67 @@ install(FILES
   DESTINATION etc
   COMPONENT server)
 
-## oceanbase-devel
-# libobcdc.so and libob_sql_proxy_parser_static.a
-set(OCEANBASE_DEVEL_LIB_FILES "")
-set(OCEANBASE_DEVEL_INCLUDE_FILES deps/oblib/src/lib/ob_errno.h)
-set(OCEANBASE_DEVEL_BIN_FILES "")
-
-message(STATUS "OB_BUILD_LIBOB_SQL_PROXY_PARSER ${OB_BUILD_LIBOB_SQL_PROXY_PARSER}")
-if (OB_BUILD_LIBOB_SQL_PROXY_PARSER)
-  # lib
-  list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/src/sql/parser/libob_sql_proxy_parser_static.a)
-
-  # headers
-  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES deps/oblib/src/common/sql_mode/ob_sql_mode.h)
-  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES src/sql/parser/ob_item_type.h)
-  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES src/sql/parser/ob_sql_parser.h)
-  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES src/sql/parser/parse_malloc.h)
-  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES src/sql/parser/parser_proxy_func.h)
-  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES src/sql/parser/parse_node.h)
-endif()
-
-if (OB_BUILD_LIBOBLOG)
-  # lib
-  # list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/tools/libobcdc/src/libobcdc.a)
-  list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/tools/obcdc/src/libobcdc.so)
-  list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/tools/obcdc/src/libobcdc.so.1)
-  list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/tools/obcdc/src/libobcdc.so.1.0.0)
-
-  # include lilboblog header
-  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES tools/obcdc/src/libobcdc.h)
-
-  # bin
-  list(APPEND OCEANBASE_DEVEL_BIN_FILES ${CMAKE_BINARY_DIR}/tools/obcdc/tests/obcdc_tailf)
-endif()
-
-set(CPACK_RPM_DEVEL_DEFAULT_USER "root")
-set(CPACK_RPM_DEVEL_DEFAULT_GROUP "root")
-
-install(PROGRAMS
-  ${OCEANBASE_DEVEL_LIB_FILES}
-  DESTINATION /usr/lib
-  COMPONENT devel
-)
-
-install(FILES
-  ${OCEANBASE_DEVEL_INCLUDE_FILES}
-  DESTINATION /usr/include
-  COMPONENT devel
-)
-
-install(PROGRAMS
-  ${OCEANBASE_DEVEL_BIN_FILES}
-  DESTINATION /usr/bin
-  COMPONENT devel
-)
-
-if (OB_BUILD_LIBOBLOG)
-  install(DIRECTORY
-    "deps/logmessage/include/"
-    DESTINATION /usr/include/oblogmsg
-    COMPONENT devel)
-endif()
+### oceanbase-devel
+## libobcdc.so and libob_sql_proxy_parser_static.a
+#set(OCEANBASE_DEVEL_LIB_FILES "")
+#set(OCEANBASE_DEVEL_INCLUDE_FILES deps/oblib/src/lib/ob_errno.h)
+#set(OCEANBASE_DEVEL_BIN_FILES "")
+#
+#message(STATUS "OB_BUILD_LIBOB_SQL_PROXY_PARSER ${OB_BUILD_LIBOB_SQL_PROXY_PARSER}")
+#if (OB_BUILD_LIBOB_SQL_PROXY_PARSER)
+#  # lib
+#  list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/src/sql/parser/libob_sql_proxy_parser_static.a)
+#
+#  # headers
+#  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES deps/oblib/src/common/sql_mode/ob_sql_mode.h)
+#  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES src/sql/parser/ob_item_type.h)
+#  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES src/sql/parser/ob_sql_parser.h)
+#  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES src/sql/parser/parse_malloc.h)
+#  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES src/sql/parser/parser_proxy_func.h)
+#  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES src/sql/parser/parse_node.h)
+#endif()
+#
+#if (OB_BUILD_LIBOBLOG)
+#  # lib
+#  # list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/tools/libobcdc/src/libobcdc.a)
+#  list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/tools/obcdc/src/libobcdc.so)
+#  list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/tools/obcdc/src/libobcdc.so.1)
+#  list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/tools/obcdc/src/libobcdc.so.1.0.0)
+#
+#  # include lilboblog header
+#  list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES tools/obcdc/src/libobcdc.h)
+#
+#  # bin
+#  list(APPEND OCEANBASE_DEVEL_BIN_FILES ${CMAKE_BINARY_DIR}/tools/obcdc/tests/obcdc_tailf)
+#endif()
+#
+#set(CPACK_RPM_DEVEL_DEFAULT_USER "root")
+#set(CPACK_RPM_DEVEL_DEFAULT_GROUP "root")
+#
+#install(PROGRAMS
+#  ${OCEANBASE_DEVEL_LIB_FILES}
+#  DESTINATION /usr/lib
+#  COMPONENT devel
+#)
+#
+#install(FILES
+#  ${OCEANBASE_DEVEL_INCLUDE_FILES}
+#  DESTINATION /usr/include
+#  COMPONENT devel
+#)
+#
+#install(PROGRAMS
+#  ${OCEANBASE_DEVEL_BIN_FILES}
+#  DESTINATION /usr/bin
+#  COMPONENT devel
+#)
+#
+#if (OB_BUILD_LIBOBLOG)
+#  install(DIRECTORY
+#    "deps/logmessage/include/"
+#    DESTINATION /usr/include/oblogmsg
+#    COMPONENT devel)
+#endif()
 
 ## oceanbase-libs
 install(PROGRAMS

tools/obcdc/CMakeLists.txt

@@ -19,10 +19,5 @@ if (OB_BUILD_LIBOBLOG)
             git submodule update --init --recursive"
             )
         endif()
-    else()
-        add_subdirectory(${PROJECT_SOURCE_DIR}/deps/logmessage ${PROJECT_BINARY_DIR}/deps/logmessage EXCLUDE_FROM_ALL)
-        add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
-        add_subdirectory(src)
-        add_subdirectory(tests)
     endif()
 endif()