From fcc0cea109e65b014f620fe77689098938e48d8f Mon Sep 17 00:00:00 2001 From: LINxiansheng Date: Thu, 3 Mar 2022 20:09:50 +0800 Subject: [PATCH] Add aarch64 el8 deps configuration --- deps/3rd/dep_create.sh | 3 ++- deps/3rd/oceanbase.el7.aarch64.deps | 26 ++++++++++---------- deps/oblib/src/lib/json_type/ob_json_bin.cpp | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/deps/3rd/dep_create.sh b/deps/3rd/dep_create.sh index 11f5124ff9..04ecb28094 100644 --- a/deps/3rd/dep_create.sh +++ b/deps/3rd/dep_create.sh @@ -76,10 +76,11 @@ function get_os_release() { elif [[ "${OS_ARCH}x" == "aarch64x" ]]; then case "$ID" in alios) + version_ge "8.0" && compat_centos8 && return version_ge "7.0" && compat_centos7 && return ;; centos) - version_ge "8.0" && compat_centos7 && return + version_ge "8.0" && OS_RELEASE=8 && return version_ge "7.0" && OS_RELEASE=7 && return ;; esac diff --git a/deps/3rd/oceanbase.el7.aarch64.deps b/deps/3rd/oceanbase.el7.aarch64.deps index 2bf5603556..f6c39f17a8 100644 --- a/deps/3rd/oceanbase.el7.aarch64.deps +++ b/deps/3rd/oceanbase.el7.aarch64.deps @@ -4,20 +4,20 @@ arch=aarch64 repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/7/aarch64/ [deps] -devdeps-gtest-1.8.0-3.el7.aarch64.rpm -devdeps-isa-l-static-2.22.0-3.el7.aarch64.rpm -devdeps-libcurl-static-7.29.0-3.el7.aarch64.rpm +devdeps-gtest-1.8.0-16.el7.aarch64.rpm +devdeps-isa-l-static-2.22.0-17.el7.aarch64.rpm +devdeps-libcurl-static-7.29.0-16.el7.aarch64.rpm devdeps-libunwind-static-1.6.2-11.el7.aarch64.rpm -devdeps-mariadb-connector-c-3.1.12-3.el7.aarch64.rpm -devdeps-openssl-static-1.0.1e-3.el7.aarch64.rpm -devdeps-libaio-0.3.112-3.el7.aarch64.rpm +devdeps-mariadb-connector-c-3.1.12-16.el7.aarch64.rpm +devdeps-openssl-static-1.0.1e-12.el7.aarch64.rpm +devdeps-libaio-0.3.112-6.el7.aarch64.rpm devdeps-rapidjson-1.1.0-1.el7.aarch64.rpm [tools] -obdevtools-binutils-2.30-3.el7.aarch64.rpm -obdevtools-bison-2.4.1-3.el7.aarch64.rpm -obdevtools-ccache-3.7.12-3.el7.aarch64.rpm -obdevtools-cmake-3.20.2-3.el7.aarch64.rpm -obdevtools-flex-2.5.35-3.el7.aarch64.rpm -obdevtools-gcc-5.2.0-3.el7.aarch64.rpm -obdevtools-llvm-11.0.1-3.el7.aarch64.rpm +obdevtools-binutils-2.30-7.el7.aarch64.rpm +obdevtools-bison-2.4.1-9.el7.aarch64.rpm +obdevtools-ccache-3.7.12-6.el7.aarch64.rpm +obdevtools-cmake-3.20.2-15.el7.aarch64.rpm +obdevtools-flex-2.5.35-10.el7.aarch64.rpm +obdevtools-gcc-5.2.0-15.el7.aarch64.rpm +obdevtools-llvm-11.0.1-36.el7.aarch64.rpm diff --git a/deps/oblib/src/lib/json_type/ob_json_bin.cpp b/deps/oblib/src/lib/json_type/ob_json_bin.cpp index c3ae3c9fa5..6e44f60ccb 100644 --- a/deps/oblib/src/lib/json_type/ob_json_bin.cpp +++ b/deps/oblib/src/lib/json_type/ob_json_bin.cpp @@ -650,7 +650,7 @@ int ObJsonBin::serialize_json_value(ObJsonNode *json_tree, ObJsonBuffer &result) case ObJsonNodeType::J_DOUBLE: { const ObJsonDouble *d = static_cast(json_tree); double value = d->value(); - if (isnan(value) || isinf(value)) { + if (std::isnan(value) || std::isinf(value)) { ret = OB_INVALID_NUMERIC; LOG_WARN("invalid double value", K(ret), K(value)); } else if (OB_FAIL(result.append(reinterpret_cast(&value), sizeof(double)))) {