support sw_64 arch build
This commit is contained in:
committed by
wangzelin.wzl
parent
addaaac260
commit
9175be1680
6
deps/3rd/dep_create.sh
vendored
6
deps/3rd/dep_create.sh
vendored
@ -87,6 +87,12 @@ function get_os_release() {
|
||||
version_ge "7.0" && OS_RELEASE=7 && return
|
||||
;;
|
||||
esac
|
||||
elif [[ "${OS_ARCH}x" == "sw_64x" ]]; then
|
||||
case "$ID" in
|
||||
UOS)
|
||||
version_ge "20" && OS_RELEASE=20 && return
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
not_supported && return 1
|
||||
}
|
||||
|
||||
24
deps/3rd/oceanbase.el20.sw_64.deps
vendored
Normal file
24
deps/3rd/oceanbase.el20.sw_64.deps
vendored
Normal file
@ -0,0 +1,24 @@
|
||||
[target-default]
|
||||
os=20
|
||||
arch=sw_64
|
||||
repo=https://mirrors.aliyun.com/oceanbase/development-kit/uos/20/sw_64/
|
||||
|
||||
[deps]
|
||||
devdeps-gtest-1.8.0-1.uos20.sw_64.rpm
|
||||
devdeps-isa-l-static-2.22.0-1.uos20.sw_64.rpm
|
||||
devdeps-libcurl-static-7.29.0-1.uos20.sw_64.rpm
|
||||
devdeps-libunwind-static-1.6.2-1.uos20.sw_64.rpm
|
||||
devdeps-mariadb-connector-c-3.1.12-1.uos20.sw_64.rpm
|
||||
devdeps-openssl-static-1.0.1e-1.uos20.sw_64.rpm
|
||||
devdeps-libaio-0.3.112-1.uos20.sw_64.rpm
|
||||
devdeps-rapidjson-1.1.0-1.uos20.sw_64.rpm
|
||||
|
||||
[tools]
|
||||
obdevtools-bison-2.4.1-1.uos20.sw_64.rpm
|
||||
obdevtools-ccache-3.7.12-1.uos20.sw_64.rpm
|
||||
obdevtools-cmake-3.20.2-1.uos20.sw_64.rpm
|
||||
obdevtools-flex-2.5.35-1.uos20.sw_64.rpm
|
||||
obdevtools-gcc-8.3.0-1.uos20.sw_64.rpm
|
||||
|
||||
[tool-deps]
|
||||
devdeps-rocksdb-6.22.1-1.uos20.sw_64.rpm
|
||||
3
deps/easy/src/io/easy_socket.h
vendored
3
deps/easy/src/io/easy_socket.h
vendored
@ -24,7 +24,10 @@ EASY_CPP_START
|
||||
#define EASY_FLAGS_REUSEPORT 0x002
|
||||
#define EASY_FLAGS_SREUSEPORT 0x004
|
||||
#define EASY_FLAGS_NOLISTEN 0x008
|
||||
|
||||
#ifndef SO_REUSEPORT
|
||||
#define SO_REUSEPORT 15
|
||||
#endif
|
||||
|
||||
int easy_unix_domain_listen(const char* path, int backlog);
|
||||
int easy_socket_listen(int udp, easy_addr_t* address, int* flags, int backlog);
|
||||
|
||||
10
deps/oblib/src/CMakeLists.txt
vendored
10
deps/oblib/src/CMakeLists.txt
vendored
@ -40,6 +40,16 @@ else()
|
||||
-Wno-psabi -Wno-sign-compare -Wno-unused-variable ${ARCH_COMPILE_OPTIONS}
|
||||
$<$<COMPILE_LANGUAGE:C>:-Wno-old-style-declaration>
|
||||
$<$<COMPILE_LANGUAGE:CXX>:-Wno-literal-suffix -Wno-invalid-offsetof>)
|
||||
|
||||
if(${ARCHITECTURE} STREQUAL "sw_64")
|
||||
target_compile_options(oblib_base_base
|
||||
INTERFACE
|
||||
-Wno-type-limits -Wno-implicit-fallthrough -Wno-deprecated-declarations
|
||||
-Wno-nonnull-compare -Wno-tautological-compare -Wno-extra -Wno-parentheses
|
||||
-Wno-memset-elt-size -Wno-comment -Wno-int-in-bool-context -Wno-unused-but-set-parameter
|
||||
-Wno-ignored-qualifiers -Wno-unused-but-set-variable -Wno-unused-value -Wno-format-truncation
|
||||
$<$<COMPILE_LANGUAGE:CXX>:-Wno-class-memaccess -Wno-aligned-new>)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
target_compile_features(oblib_base_base INTERFACE cxx_std_11)
|
||||
|
||||
1
deps/oblib/src/lib/charset/ob_charset.cpp
vendored
1
deps/oblib/src/lib/charset/ob_charset.cpp
vendored
@ -15,6 +15,7 @@
|
||||
#include "lib/utility/serialization.h"
|
||||
#include "lib/ob_define.h"
|
||||
#include "lib/worker.h"
|
||||
#include "math.h"
|
||||
|
||||
namespace oceanbase {
|
||||
namespace common {
|
||||
|
||||
3
deps/oblib/src/lib/json_type/ob_json_bin.h
vendored
3
deps/oblib/src/lib/json_type/ob_json_bin.h
vendored
@ -460,7 +460,6 @@ private:
|
||||
uint64_t new_val_entry_offset, uint64_t count, uint8_t var_type, int64_t st_pos,
|
||||
ObJsonBuffer &result, ObJBVerType cur_vertype, ObJBVerType dest_vertype) const;
|
||||
|
||||
#define JB_PATH_NODE_LEN sizeof(struct ObJBNodeMeta)
|
||||
|
||||
void stack_update(ObJsonBuffer& stack, uint32_t idx, const ObJBNodeMeta& new_value);
|
||||
int stack_copy(ObJsonBuffer& src, ObJsonBuffer& dst);
|
||||
@ -519,4 +518,4 @@ public:
|
||||
|
||||
} // namespace common
|
||||
} // namespace oceanbase
|
||||
#endif // OCEANBASE_SQL_OB_JSON_BIN
|
||||
#endif // OCEANBASE_SQL_OB_JSON_BIN
|
||||
|
||||
Reference in New Issue
Block a user