diff --git a/build.sh b/build.sh index 40f59235a..2b5e2cee9 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,6 @@ declare build_version_mode='release' declare build_binarylib_dir='None' declare wrap_binaries='NO' declare not_optimized='' -declare distribute='NO' ######################################################################### ##read command line paramenters ####################################################################### diff --git a/build/script/mpp_package.sh b/build/script/mpp_package.sh index d28f6735a..36c083646 100644 --- a/build/script/mpp_package.sh +++ b/build/script/mpp_package.sh @@ -730,15 +730,15 @@ function install_gaussdb() GAUSSDB_EXTRA_FLAGS=" -D__USE_NUMA -D__ARM_LSE" fi - ./configure $shared_opt CFLAGS="-O2 -g3 ${GAUSSDB_EXTRA_FLAGS}" CC=g++ $extra_config_opt >> "$LOG_FILE" 2>&1 + ./configure $shared_opt CFLAGS="-O2 -g3 ${GAUSSDB_EXTRA_FLAGS}" --enable-mot CC=g++ $extra_config_opt >> "$LOG_FILE" 2>&1 elif [ "$version_mode"x == "memcheck"x ]; then - ./configure $shared_opt CFLAGS="-O0" --enable-debug --enable-cassert --enable-memory-check CC=g++ $extra_config_opt >> "$LOG_FILE" 2>&1 + ./configure $shared_opt CFLAGS="-O0" --enable-mot --enable-debug --enable-cassert --enable-memory-check CC=g++ $extra_config_opt >> "$LOG_FILE" 2>&1 elif [ "$version_mode"x == "fiurelease"x ]; then - ./configure $shared_opt CFLAGS="-O2 -g3 ${GAUSSDB_EXTRA_FLAGS}" --disable-jemalloc CC=g++ $extra_config_opt >> "$LOG_FILE" 2>&1 + ./configure $shared_opt CFLAGS="-O2 -g3 ${GAUSSDB_EXTRA_FLAGS}" --enable-mot --disable-jemalloc CC=g++ $extra_config_opt >> "$LOG_FILE" 2>&1 elif [ "$version_mode"x == "fiudebug"x ]; then - ./configure $shared_opt CFLAGS="-O0 ${GAUSSDB_EXTRA_FLAGS}" --enable-debug --enable-cassert --disable-jemalloc CC=g++ $extra_config_opt >> "$LOG_FILE" 2>&1 + ./configure $shared_opt CFLAGS="-O0 ${GAUSSDB_EXTRA_FLAGS}" --enable-mot --enable-debug --enable-cassert --disable-jemalloc CC=g++ $extra_config_opt >> "$LOG_FILE" 2>&1 else - ./configure $shared_opt CFLAGS="-O0 ${GAUSSDB_EXTRA_FLAGS}" --enable-debug --enable-cassert CC=g++ $extra_config_opt >> "$LOG_FILE" 2>&1 + ./configure $shared_opt CFLAGS="-O0 ${GAUSSDB_EXTRA_FLAGS}" --enable-mot --enable-debug --enable-cassert CC=g++ $extra_config_opt >> "$LOG_FILE" 2>&1 fi fi diff --git a/src/gausskernel/Makefile b/src/gausskernel/Makefile index 121bd10b7..f3827db4d 100644 --- a/src/gausskernel/Makefile +++ b/src/gausskernel/Makefile @@ -669,7 +669,7 @@ ifeq ($(enable_thread_check), yes) endif cp $(with_3rd)/buildtools/server_key/* '$(DESTDIR)$(bindir)/' endif - cp -r $(with_3rd)/platform/$(PLAT_FORM_STR)/huaweijdk8/jdk1.8.0_272/jre/* '$(DESTDIR)$(bindir)/../jre/' + cp -r $(with_3rd)/platform/$(PLAT_FORM_STR)/openjdk8/jdk1.8.222/jre/* '$(DESTDIR)$(bindir)/../jre/' cp $(PLJAVA_LIB_PATH)/* '$(DESTDIR)$(libdir)/' cp $(PLJAVA_JAR_PATH)/$(JARPLJAVA) '$(DESTDIR)$(pkglibdir)/java/' diff --git a/src/get_PlatForm_str.sh b/src/get_PlatForm_str.sh index a96a20d3f..ee4523c2a 100644 --- a/src/get_PlatForm_str.sh +++ b/src/get_PlatForm_str.sh @@ -20,6 +20,12 @@ kernel="" if [ -f "/etc/euleros-release" ] then kernel=$(cat /etc/euleros-release | awk -F ' ' '{print $1}' | tr A-Z a-z) +elif [ -f "/etc/openEuler-release" ] +then + kernel=$(cat /etc/openEuler-release | awk -F ' ' '{print $1}' | tr A-Z a-z) +elif [ -f "/etc/centos-release" ] +then + kernel=$(cat /etc/centos-release | awk -F ' ' '{print $1}' | tr A-Z a-z) else kernel=$(lsb_release -d | awk -F ' ' '{print $2}'| tr A-Z a-z) fi