hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'pr_1576'

Browse Source
This commit is contained in:
ob-robot
2023-10-13 04:11:26 +00:00
parent 8b804c84d6 36a35f8512
commit efaf81080c
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/script/bitcode_to_elfobj
View File

@ -75,6 +75,12 @@ def shell_run_command(command_str, need_print_all=True, need_print_output=True,
if data == b'': if data == b'':
if ps.poll() is not None: if ps.poll() is not None:
break break
# fix: python2->python3 subprocess shell bug
# 2023/09/21 jiangxf
try:
data = data.decode()
except:
pass
result["return_message"].append(data) result["return_message"].append(data)
if not need_print_all: if not need_print_all:

4
deps/init/dep_create.sh vendored
View File

@ -70,6 +70,10 @@ function get_os_release() {
version_ge "8.0" && OS_RELEASE=8 && return version_ge "8.0" && OS_RELEASE=8 && return
version_ge "7.0" && OS_RELEASE=7 && return version_ge "7.0" && OS_RELEASE=7 && return
;; ;;
almalinux)
version_ge "9.0" && compat_centos9 && return
version_ge "8.0" && compat_centos8 && return
;;
debian) debian)
version_ge "9" && compat_centos7 && return version_ge "9" && compat_centos7 && return
;; ;;