From 42fa93230d63b5090434150c9abf49d0b060adb6 Mon Sep 17 00:00:00 2001 From: wenxingsen Date: Fri, 29 Mar 2024 10:21:12 +0000 Subject: [PATCH] add no-lse option for package --- cmake/Env.cmake | 10 +++++++++- rpm/oceanbase-ce-build.sh | 6 +++++- rpm/oceanbase-ce-cdc-build.sh | 6 +++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/cmake/Env.cmake b/cmake/Env.cmake index 90e2df60d..c0cb40652 100644 --- a/cmake/Env.cmake +++ b/cmake/Env.cmake @@ -40,6 +40,8 @@ ob_define(OB_ENABLE_UNITY ON) ob_define(OB_BUILD_OPENSOURCE ON) +ob_define(OB_DISABLE_LSE OFF) + if(WITH_COVERAGE) # -ftest-coverage to generate .gcno file @@ -272,7 +274,13 @@ if( ${ARCHITECTURE} STREQUAL "x86_64" ) set(ARCH_LDFLAGS "") set(OCI_DEVEL_INC "${DEP_3RD_DIR}/usr/include/oracle/12.2/client64") else() - set(MARCH_CFLAGS "-march=armv8-a+crc+lse" ) + if (${OB_DISABLE_LSE}) + message(STATUS "build with no-lse") + set(MARCH_CFLAGS "-march=armv8-a+crc") + else() + message(STATUS "build with lse") + set(MARCH_CFLAGS "-march=armv8-a+crc+lse") + endif() set(MTUNE_CFLAGS "-mtune=generic" ) set(ARCH_LDFLAGS "-l:libatomic.a") set(OCI_DEVEL_INC "${DEP_3RD_DIR}/usr/include/oracle/19.10/client64") diff --git a/rpm/oceanbase-ce-build.sh b/rpm/oceanbase-ce-build.sh index 113488984..e50cf5876 100644 --- a/rpm/oceanbase-ce-build.sh +++ b/rpm/oceanbase-ce-build.sh @@ -8,7 +8,10 @@ RELEASE=$4 CURDIR=$PWD TOP_DIR=`pwd`/../ -echo "[BUILD] args: TOP_DIR=${TOP_DIR} PROJECT_NAME=${PROJECT_NAME} VERSION=${VERSION} RELEASE=${RELEASE}" +OB_DISABLE_LSE_OPTION="" +[[ $OB_DISABLE_LSE == "1" ]] && OB_DISABLE_LSE_OPTION="-DOB_DISABLE_LSE=ON" + +echo "[BUILD] args: TOP_DIR=${TOP_DIR} PROJECT_NAME=${PROJECT_NAME} VERSION=${VERSION} RELEASE=${RELEASE} ${OB_DISABLE_LSE_OPTION}" cd ${TOP_DIR} ./build.sh clean @@ -16,6 +19,7 @@ cd ${TOP_DIR} rpm \ -DOB_RELEASEID=$RELEASE \ -DBUILD_NUMBER=$RELEASE \ + ${OB_DISABLE_LSE_OPTION}\ --init \ --make rpm || exit 1 diff --git a/rpm/oceanbase-ce-cdc-build.sh b/rpm/oceanbase-ce-cdc-build.sh index 79b8b28ad..57f61e667 100644 --- a/rpm/oceanbase-ce-cdc-build.sh +++ b/rpm/oceanbase-ce-cdc-build.sh @@ -8,7 +8,10 @@ RELEASE=$4 CURDIR=$PWD TOP_DIR=`pwd`/../ -echo "[BUILD] args: TOP_DIR=${TOP_DIR} PROJECT_NAME=${PROJECT_NAME} VERSION=${VERSION} RELEASE=${RELEASE}" +OB_DISABLE_LSE_OPTION="" +[[ $OB_DISABLE_LSE == "1" ]] && OB_DISABLE_LSE_OPTION="-DOB_DISABLE_LSE=ON" + +echo "[BUILD] args: TOP_DIR=${TOP_DIR} PROJECT_NAME=${PROJECT_NAME} VERSION=${VERSION} RELEASE=${RELEASE} ${OB_DISABLE_LSE_OPTION}" cd ${TOP_DIR} ./tools/upgrade/gen_obcdc_compatiable_info.py @@ -18,6 +21,7 @@ cd ${TOP_DIR} -DOB_BUILD_CDC=ON \ -DOB_RELEASEID=$RELEASE \ -DBUILD_NUMBER=$RELEASE \ + ${OB_DISABLE_LSE_OPTION}\ --init \ --make rpm || exit 1