database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

适配 uos 桌面系统

Browse Source
This commit is contained in:
huchangqi
2024-10-24 11:41:15 +08:00
parent f4fd0189ed
commit 9584c871ff
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/script/cmake_package_mini.sh
View File

@ -59,7 +59,7 @@ gcc_version="8.3.0"
##add platform architecture information
cpus_num=$(grep -w processor /proc/cpuinfo|wc -l)
PLATFORM_ARCH=$(uname -p)
PLATFORM_ARCH=$(uname -m)
if [ "$PLATFORM_ARCH"X == "aarch64"X ] ; then
ARCHITECTURE_EXTRA_FLAG=_euleros2.0_${ext_version}_$PLATFORM_ARCH
release_file_list="aarch64_lite_list"

0
build/script/separate_debug_information.sh Normal file → Executable file
View File

4
build/script/utils/common.sh
View File

@ -4,7 +4,7 @@
declare LOG_FILE="${SCRIPT_DIR}/makemppdb_pkg.log"
declare product_name='openGauss'
declare PLATFORM_ARCH=$(uname -p)
declare PLATFORM_ARCH=$(uname -m)
declare package_path=${ROOT_DIR}/output
declare install_package_format="tar"
declare PLATFORM=32
@ -110,7 +110,7 @@ export CC="${USE_CCACHE}$BUILD_TOOLS_PATH/gcc$gcc_version/gcc/bin/gcc"
export CXX="${USE_CCACHE}$BUILD_TOOLS_PATH/gcc$gcc_version/gcc/bin/g++"
export LD_LIBRARY_PATH=$BUILD_TOOLS_PATH/gcc$gcc_version/gcc/lib64:$BUILD_TOOLS_PATH/gcc$gcc_version/isl/lib:$BUILD_TOOLS_PATH/gcc$gcc_version/mpc/lib/:$BUILD_TOOLS_PATH/gcc$gcc_version/mpfr/lib/:$BUILD_TOOLS_PATH/gcc$gcc_version/gmp/lib/:$LD_LIBRARY_PATH
export PATH=$BUILD_TOOLS_PATH/gcc$gcc_version/gcc/bin:$PATH
export JAVA_HOME=${PLATFORM_PATH}/huaweijdk8/${PLATFORM_ARCH}/jdk
export JAVA_HOME=${PLATFORM_PATH}/openjdk8/${PLATFORM_ARCH}/jdk
declare ERR_FAILED=1
declare ERR_OK=0

4
liteom/install.sh
View File

@ -577,7 +577,7 @@ function decompress()
then
platform=64
fi
platform_arch=$(uname -p)
platform_arch=$(uname -m)
bin_name="openGauss-Lite.*-${kernel}-${platform_arch}"
bin_res=$(ls -a | grep -E "${bin_name}.bin")
if [ "${bin_res}" = "" ]
@ -1250,4 +1250,4 @@ function main()
info "run cmd 'source ${env_file}' to make the environment variables take effect."
}
main
exit 0
exit 0

4
liteom/upgrade_common.sh
View File

@ -398,7 +398,7 @@ function check_pkg() {
log "kernel: ${kernel}"
#detect platform information.
platform_arch=$(uname -p)
platform_arch=$(uname -m)
bin_name="openGauss-Lite.*-${kernel}-${platform_arch}"
binfile=$(ls -a | grep -E "${binname}.bin")
shafile=${binfile%.*}.sha256
@ -1242,4 +1242,4 @@ function delete_tmp_files() {
fi
rm -f "$GAUSS_TMP_PATH"/version_flag
rm -f "$GAUSS_TMP_PATH"/record_step.txt
}
}

4
src/Makefile.global.in
View File

@ -343,9 +343,9 @@ endif
PLJAVA_HOME = $(with_3rd)/$(BINARYPATH)/pljava/$(LIB_SUPPORT_LLT)
using_openjdk = $(shell if [ -d "$(with_3rd)/$(PLATFORMPATH)/openjdk8" ]; then echo "yes"; else echo "no"; fi;)
ifeq ($(using_openjdk), yes)
JAVA_HOME = $(with_3rd)/${PLATFORMPATH}/openjdk8/$(shell uname -p)/jdk
JAVA_HOME = $(with_3rd)/${PLATFORMPATH}/openjdk8/$(shell uname -m)/jdk
else
JAVA_HOME = $(with_3rd)/${PLATFORMPATH}/huaweijdk8/$(shell uname -p)/jdk
JAVA_HOME = $(with_3rd)/${PLATFORMPATH}/huaweijdk8/$(shell uname -m)/jdk
endif
MASSTREE_HOME = $(with_3rd)/$(BINARYPATH)/masstree/comm
MYFDW_HOME = $(with_3rd)/$(BINARYPATH)/mysql_fdw

12
src/gausskernel/Makefile
View File

@ -646,12 +646,12 @@ ifeq ($(enable_thread_check), yes)
cp $(top_builddir)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libtsan.so.0.0.0 '$(DESTDIR)$(libdir)/'
endif
else
#cp $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libstdc++.so.6 '$(DESTDIR)$(libdir)/'
#cp $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libgcc_s.so.1 '$(DESTDIR)$(libdir)/'
#cp $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libgomp.so* '$(DESTDIR)$(libdir)/'
cp /usr/lib64/libstdc++.so.6 '$(DESTDIR)$(libdir)/'
cp /usr/lib64/libgcc_s.so.1 '$(DESTDIR)$(libdir)/'
cp /usr/lib64/libgomp.so* '$(DESTDIR)$(libdir)/'
cp $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libstdc++.so.6 '$(DESTDIR)$(libdir)/'
cp $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libgcc_s.so.1 '$(DESTDIR)$(libdir)/'
cp $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libgomp.so* '$(DESTDIR)$(libdir)/'
#cp /usr/lib64/libstdc++.so.6 '$(DESTDIR)$(libdir)/'
#cp /usr/lib64/libgcc_s.so.1 '$(DESTDIR)$(libdir)/'
#cp /usr/lib64/libgomp.so* '$(DESTDIR)$(libdir)/'
ifeq ($(enable_mot), yes)
cp -d $(with_3rd)/$(BUILD_TOOLS_PATH)/gcc$(subst .0,,$(CC_VERSION))/gcc/lib64/libatomic.so* '$(DESTDIR)$(libdir)/'
endif