diff --git a/build/script/package_opengauss.sh b/build/script/package_opengauss.sh index 878538a1d..fd36ac247 100755 --- a/build/script/package_opengauss.sh +++ b/build/script/package_opengauss.sh @@ -355,6 +355,7 @@ function target_file_copy() copy_files_list "$1" $2 cp ${SCRIPT_DIR}/version.cfg ${BUILD_DIR}/temp + cp -rf ${SCRIPT_DIR}/../../simpleInstall ${BUILD_DIR}/temp if [ $? -ne 0 ]; then die "copy ${SCRIPT_DIR}/version.cfg to ${BUILD_DIR}/temp failed" fi diff --git a/cmake/src/set_thirdparty_path.cmake b/cmake/src/set_thirdparty_path.cmake index 940b6c469..d5d5bc2a6 100755 --- a/cmake/src/set_thirdparty_path.cmake +++ b/cmake/src/set_thirdparty_path.cmake @@ -67,7 +67,7 @@ set(NANOMSG_HOME ${DEPENDENCY_PATH}/nanomsg/${LIB_NOT_SUPPORT_LLT}) set(NCURSES_HOME ${DEPENDENCY_PATH}/ncurses/${SUPPORT_LLT}) set(OPENSSL_HOME ${DEPENDENCY_PATH}/openssl/${LIB_NOT_SUPPORT_LLT}) set(PLJAVA_HOME ${DEPENDENCY_PATH}/pljava/${LIB_NOT_SUPPORT_LLT}) -set(JAVA_HOME ${3RD_PATH}/platform/huaweijdk8/${BUILD_TUPLE}/jdk) +set(JAVA_HOME ${3RD_PATH}/platform/openjdk8/${BUILD_TUPLE}/jdk) set(PROTOBUF_HOME ${DEPENDENCY_PATH}/protobuf/${SUPPORT_LLT}) set(THRIFT_HOME ${DEPENDENCY_PATH}/thrift) set(SNAPPY_HOME ${DEPENDENCY_PATH}/snappy/${SUPPORT_LLT}) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 4b3b4e9ac..3cfe30121 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -306,6 +306,7 @@ ifeq ($(with_3rd), NONE) ZSTD_HOME = $(top_builddir)/$(BINARYPATH)/zstd LIBNANOMSG_HOME = $(top_builddir)/$(BINARYPATH)/nanomsg/comm PLJAVA_HOME = $(top_builddir)/$(BINARYPATH)/pljava/$(LIB_SUPPORT_LLT) + JAVA_HOME = $(top_builddir)/$(PLATFORMPATH)/openjdk8/jdk1.8.0_222 MASSTREE_HOME = $(top_builddir)/$(BINARYPATH)/masstree/comm MYFDW_HOME = $(top_builddir)/dependency/mysql_fdw ORCFDW_HOME = $(top_builddir)/dependency/oracle_fdw @@ -350,6 +351,7 @@ endif ZSTD_HOME = $(with_3rd)/$(BINARYPATH)/zstd LIBNANOMSG_HOME = $(with_3rd)/$(BINARYPATH)/nanomsg/comm PLJAVA_HOME = $(with_3rd)/$(BINARYPATH)/pljava/$(LIB_SUPPORT_LLT) + JAVA_HOME = $(with_3rd)/$(PLATFORMPATH)/openjdk8/jdk1.8.0_222 MASSTREE_HOME = $(with_3rd)/$(BINARYPATH)/masstree/comm MYFDW_HOME = $(with_3rd)/dependency/mysql_fdw ORCFDW_HOME = $(with_3rd)/dependency/oracle_fdw