diff --git a/CMakeLists.txt b/CMakeLists.txt index a52f8bb4d95346bc6a82d7d5d3eae4bb5325cb29..715a5fe018c94a7455784564d5687f7ee5b56849 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,11 +278,23 @@ if (WITH_ASAN) SET(ASAN_LINK_OPTION "-fsanitize=address") endif () +######### get arch ########################################### +execute_process(COMMAND uname -m + OUTPUT_VARIABLE ARCH + OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY + ) +set(OS_ARCH ${ARCH}) +message(STATUS "os arch ${OS_ARCH}") # x86_64 or aarch64 + + SET(CMAKE_CXX_STANDARD 17) SET(CMAKE_CXX_STANDARD_REQUIRED ON) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -static-libstdc++ ${DEBUG_SYMBOL} -pipe -m64 -Wall -fPIC -Wno-reorder ${ASAN_COMPILE_OPTION} -D__OMS_VERSION__=\\\"${GIT_VERSION}\\\" ${OBLOGMSG_MAPPING} ${OBCDC_NAME_VAR}") -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 ${DEBUG_SYMBOL} -pipe -m64 -Wall -fPIC ${ASAN_COMPILE_OPTION} -D__STDC_LIMIT_MACROS -D__OMS_VERSION__=\\\"${GIT_VERSION}\\\" ${OBLOGMSG_MAPPING} ${OBCDC_NAME_VAR}") - +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -static-libstdc++ ${DEBUG_SYMBOL} -pipe -Wall -fPIC -Wno-reorder ${ASAN_COMPILE_OPTION} -D__OMS_VERSION__=\\\"${GIT_VERSION}\\\" ${OBLOGMSG_MAPPING} ${OBCDC_NAME_VAR}") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 ${DEBUG_SYMBOL} -pipe -Wall -fPIC ${ASAN_COMPILE_OPTION} -D__STDC_LIMIT_MACROS -D__OMS_VERSION__=\\\"${GIT_VERSION}\\\" ${OBLOGMSG_MAPPING} ${OBCDC_NAME_VAR}") +if(OS_ARCH STREQUAL "x86_64") + add_compile_options($<$:-m64>) +endif() if (CMAKE_SYSTEM_NAME STREQUAL "Linux") SET(PLATFORM_SPEC rt) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc") diff --git a/deps/oblogproxy.el7.aarch64.deps b/deps/oblogproxy.el7.aarch64.deps new file mode 100644 index 0000000000000000000000000000000000000000..1e5af6f0895a562403a8ba1dae9cc5c6a1cbddb2 --- /dev/null +++ b/deps/oblogproxy.el7.aarch64.deps @@ -0,0 +1,13 @@ +[target] +os=7 +arch=aarch64 +kit_repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/7/aarch64 +stable_repo=https://mirrors.aliyun.com/oceanbase/community/stable/el/7/aarch64 +[deps] +oceanbase-ce-cdc-4.2.0.0-100000052023080211.el7.aarch64.rpm +oceanbase-ce-devel-3.1.4-10000092022071511.el7.aarch64.rpm +[tools] +obdevtools-gcc9-9.3.0-52022092914.el7.aarch64.rpm +devdeps-openssl-static-1.0.1e-12022100422.el7.aarch64.rpm +devdeps-libaio-0.3.112-12022092915.el7.aarch64.rpm +devdeps-mariadb-connector-c-3.1.12-12022100422.el7.aarch64.rpm diff --git a/deps/oblogproxy.el7.x86_64.deps b/deps/oblogproxy.el7.x86_64.deps index 487ae6b791e8ca26de67c978581b03cc1bc6711b..6fde55567062f6835f4649c63fcfa091a616acd7 100644 --- a/deps/oblogproxy.el7.x86_64.deps +++ b/deps/oblogproxy.el7.x86_64.deps @@ -8,8 +8,8 @@ stable_repo=https://mirrors.aliyun.com/oceanbase/community/stable/el/7/x86_64/ devdeps-openssl-static-1.0.1e-12022100422.el7.x86_64.rpm devdeps-libaio-0.3.112-12022092915.el7.x86_64.rpm devdeps-mariadb-connector-c-3.1.12-12022100422.el7.x86_64.rpm -oceanbase-ce-cdc-4.1.0.1-102000052023061516.el7.x86_64.rpm +oceanbase-ce-cdc-4.2.0.0-100000052023080211.el7.x86_64.rpm oceanbase-ce-devel-3.1.4-10000092022071511.el7.x86_64.rpm [tools] -obdevtools-gcc9-9.3.0-52022092914.el7.x86_64.rpm \ No newline at end of file +obdevtools-gcc9-9.3.0-52022092914.el7.x86_64.rpm diff --git a/deps/oblogproxy.el8.x86_64.deps b/deps/oblogproxy.el8.x86_64.deps index 6b26707a71fc607c6b23d56d8765da765a1c859b..d5d4f98dec102d6591b24316579cbe3fc75050a3 100644 --- a/deps/oblogproxy.el8.x86_64.deps +++ b/deps/oblogproxy.el8.x86_64.deps @@ -8,7 +8,7 @@ stable_repo=https://mirrors.aliyun.com/oceanbase/community/stable/el/8/x86_64/ devdeps-openssl-static-1.0.1e-12022100422.el8.x86_64.rpm devdeps-libaio-0.3.112-12022092915.el8.x86_64.rpm devdeps-mariadb-connector-c-3.1.12-12022100422.el8.x86_64.rpm -oceanbase-ce-cdc-4.1.0.1-102000052023061516.el8.x86_64.rpm +oceanbase-ce-cdc-4.2.0.0-100000042023072615.el7.x86_64.rpm oceanbase-ce-devel-3.1.4-10000092022071511.el8.x86_64.rpm [tools]