diff --git a/cmake/src/set_thirdparty_path.cmake b/cmake/src/set_thirdparty_path.cmake index 1655587ffd0e867791155aba979d7d79a9d6f486..6d97fc1e1e6d50e7e2aa565c596e36f56c12d57b 100755 --- a/cmake/src/set_thirdparty_path.cmake +++ b/cmake/src/set_thirdparty_path.cmake @@ -41,24 +41,13 @@ set(BUILDTOOLS_PATH ${3RD_PATH}/buildtools) set(COMPONENT_PATH ${3RD_PATH}/kernel/component) set(CJSON_HOME ${DEPENDENCY_PATH}/cjson/${SUPPORT_LLT}) -set(ETCD_HOME ${DEPENDENCY_PATH}/etcd/${LIB_UNIFIED_SUPPORT}) set(EVENT_HOME ${DEPENDENCY_PATH}/event/${LIB_UNIFIED_SUPPORT}) set(FIO_HOME ${DEPENDENCY_PATH}/fio/${SUPPORT_LLT}) -set(IPERF_HOME ${DEPENDENCY_PATH}/iperf/${LIB_UNIFIED_SUPPORT}) -if("${VERSION_TYPE}" STREQUAL "debug" OR "${VERSION_TYPE}" STREQUAL "memcheck") - set(JEMALLOC_HOME ${DEPENDENCY_PATH}/jemalloc/debug${JEMALLOC_SUPPORT_LLT}) -else() - set(JEMALLOC_HOME ${DEPENDENCY_PATH}/jemalloc/${VERSION_TYPE}${JEMALLOC_SUPPORT_LLT}) -endif() set(KERBEROS_HOME ${DEPENDENCY_PATH}/kerberos/${SUPPORT_LLT}) set(KMC_HOME ${PLATFORM_PATH}/kmc/${LIB_UNIFIED_SUPPORT}) -set(CGROUP_HOME ${DEPENDENCY_PATH}/libcgroup/${SUPPORT_LLT}) set(CURL_HOME ${DEPENDENCY_PATH}/libcurl/${SUPPORT_LLT}) -set(EDIT_HOME ${DEPENDENCY_PATH}/libedit/${SUPPORT_LLT}) set(OBS_HOME ${DEPENDENCY_PATH}/libobs/${LIB_UNIFIED_SUPPORT}) -set(XML2_HOME ${DEPENDENCY_PATH}/libxml2/${SUPPORT_LLT}) set(LLVM_HOME ${DEPENDENCY_PATH}/llvm/${LIB_UNIFIED_SUPPORT}) -set(LZ4_HOME ${DEPENDENCY_PATH}/lz4/${SUPPORT_LLT}) set(NANOMSG_HOME ${DEPENDENCY_PATH}/nng/${LIB_UNIFIED_SUPPORT}) set(NCURSES_HOME ${DEPENDENCY_PATH}/ncurses/${SUPPORT_LLT}) set(AWSSDK_HOME ${DEPENDENCY_PATH}/aws-sdk-cpp/${SUPPORT_LLT}) @@ -68,15 +57,9 @@ else() set(OPENSSL_HOME ${DEPENDENCY_PATH}/openssl/${LIB_UNIFIED_SUPPORT}) endif() -set(PLJAVA_HOME ${DEPENDENCY_PATH}/pljava/${LIB_UNIFIED_SUPPORT}) -if (EXISTS "${PLATFORM_PATH}/openjdk8/${BUILD_TUPLE}/jdk") - set(JAVA_HOME ${PLATFORM_PATH}/openjdk8/${BUILD_TUPLE}/jdk) -else() - set(JAVA_HOME ${PLATFORM_PATH}/huaweijdk8/${BUILD_TUPLE}/jdk) -endif() +set(JAVA_HOME /usr/lib/jvm/java/) set(ZLIB_HOME ${DEPENDENCY_PATH}/zlib1.2.11/${SUPPORT_LLT}) set(XGBOOST_HOME ${DEPENDENCY_PATH}/xgboost/${SUPPORT_LLT}) -set(ZSTD_HOME ${DEPENDENCY_PATH}/zstd) set(LICENSE_HOME ${PLATFORM_PATH}/AdaptiveLM_C_V100R005C01SPC002/${SUPPORT_LLT}) set(HOTPATCH_HOME ${PLATFORM_PATH}/hotpatch) set(SECURE_HOME ${PLATFORM_PATH}/Huawei_Secure_C/${LIB_UNIFIED_SUPPORT}) @@ -89,9 +72,7 @@ set(HCOM4DB_HOME ${COMPONENT_PATH}/hcom4db) set(MOCKCPP_HOME ${BUILDTOOLS_PATH}/mockcpp/${LIB_UNIFIED_SUPPORT}) set(GTEST_HOME ${BUILDTOOLS_PATH}/gtest/${LIB_UNIFIED_SUPPORT}) set(MASSTREE_HOME ${BUILDTOOLS_PATH}/masstree/${LIB_UNIFIED_SUPPORT}) -set(NUMA_HOME ${DEPENDENCY_PATH}/numactl/${SUPPORT_LLT}) set(BOOST_HOME ${DEPENDENCY_PATH}/boost/${SUPPORT_LLT}) -set(ODBC_HOME ${DEPENDENCY_PATH}/unixodbc) set(MASSTREE_HOME ${DEPENDENCY_PATH}/masstree/${LIB_UNIFIED_SUPPORT}) set(LCOV_HOME ${BUILDTOOLS_PATH}/gcc${GCC_VERSION_LIT}/gcc/lib/gcc/${HOST_TUPLE}) set(GCC_LIB_PATH $ENV{GCC_INSTALL_HOME}) @@ -216,8 +197,8 @@ set(LIBOBS_LIB_PATH ${OBS_HOME}/lib) ############################################################################# # xml2 component ############################################################################# -set(LIBXML_INCLUDE_PATH ${XML2_HOME}/include) -set(LIBXML_LIB_PATH ${XML2_HOME}/lib) +set(LIBXML_INCLUDE_PATH /usr/include) +set(LIBXML_LIB_PATH /usr/lib64) ############################################################################# # llvm component diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d047ad5bf8b850d62120851ff43e65cee845d0ae..3c89290c318f3d1458f7f6f3ac6d35188091153a 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -206,25 +206,17 @@ if(${ENABLE_MULTIPLE_NODES}_${ENABLE_PRIVATEGAUSS} STREQUAL OFF_OFF AND NOT ${EN if(EXISTS ${DSS_BIN_PATH}) install(DIRECTORY ${DSS_BIN_PATH} DESTINATION . FILE_PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE) endif() - if(EXISTS ${LIBODBC_LIB_PATH}) - install(DIRECTORY ${LIBODBC_LIB_PATH} DESTINATION .) - endif() if(EXISTS ${HCOM4DB_LIB_PATH}) install(DIRECTORY ${HCOM4DB_LIB_PATH} DESTINATION .) endif() endif() -install(DIRECTORY ${ZSTD_LIB_PATH} DESTINATION . PATTERN "*.a" EXCLUDE) if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON") install(DIRECTORY ${LIBOBS_LIB_PATH} DESTINATION .) install(DIRECTORY ${LIBOBS_INCLUDE_PATH} DESTINATION include/postgresql/server/access/obs) endif() install(DIRECTORY ${CJSON_LIB_PATH} DESTINATION .) install(DIRECTORY ${CJSON_INCLUDE_PATH}/cjson DESTINATION include/postgresql/server) -if(NOT ${ENABLE_LITE_MODE} STREQUAL ON) - install(DIRECTORY ${ETCD_BIN_PATH} DESTINATION .) - install(DIRECTORY ${IPERF_LIB_PATH} DESTINATION .) -endif() if(NOT ${ENABLE_LITE_MODE} STREQUAL ON) if(NOT ${ENABLE_MULTIPLE_NODES}_${ENABLE_PRIVATEGAUSS} STREQUAL OFF_OFF) install(DIRECTORY ${KMC_LIB_PATH} DESTINATION .) @@ -237,16 +229,11 @@ if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON") install(DIRECTORY ${KERBEROS_BIN_PATH} DESTINATION .) install(DIRECTORY ${KERBEROS_LIB_PATH} DESTINATION .) endif() -install(DIRECTORY ${LZ4_LIB_PATH} DESTINATION .) -install(DIRECTORY ${LZ4_BIN_PATH} DESTINATION .) install(DIRECTORY ${LIBOPENSSL_BIN_PATH} DESTINATION .) install(DIRECTORY ${LIBOPENSSL_LIB_PATH} DESTINATION . PATTERN "*.a" EXCLUDE ) install(DIRECTORY ${ZLIB_LIB_PATH} DESTINATION . FILES_MATCHING PATTERN "libz.*") list(FIND MACRO_OPTIONS "-D__USE_NUMA" RET_NUMA) -if(NOT ${RET_NUMA} EQUAL -1) - install(DIRECTORY ${NUMA_LIB_PATH} DESTINATION .) -endif() if("${ENABLE_MOT}" STREQUAL "ON") install(DIRECTORY ${MASSTREE_LIB_PATH} DESTINATION .) @@ -266,11 +253,6 @@ install(FILES ${GCC_LIB_PATH}/lib64/libgomp.so DESTINATION lib) install(FILES ${GCC_LIB_PATH}/lib64/libgomp.so.1 DESTINATION lib) install(FILES ${GCC_LIB_PATH}/lib64/libgomp.so.1.0.0 DESTINATION lib) install(FILES ${XGBOOST_LIB_PATH}/libxgboost.so DESTINATION lib) -if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON") - install(FILES ${PLJAVA_HOME}/lib/libpljava.so DESTINATION lib) - install(FILES ${PLJAVA_HOME}/java/pljava.jar DESTINATION lib/postgresql/java) - install(FILES ${PLJAVA_HOME}/udstools.py DESTINATION share/postgresql/tmp) -endif() if(NOT ${ENABLE_MULTIPLE_NODES}_${ENABLE_PRIVATEGAUSS} STREQUAL OFF_OFF) if("${SUPPORT_HOTPATCH}" STREQUAL "yes") install(FILES ${LIBHOTPATCH_LIB_PATH}/libdoprapatch.a DESTINATION lib) @@ -296,11 +278,6 @@ install(CODE "execute_process( ) # install(DIRECTORY ${LIBCGROUP_LIB_PATH} DESTINATION . FILES_MATCHING PATTERN "libcgroup.so*") -install(CODE "execute_process( -COMMAND cp ${LIBCGROUP_LIB_PATH}/libcgroup.so.1.0.42 ${prefix_home}/lib/libcgroup.so -COMMAND ln -fs libcgroup.so libcgroup.so.1 -WORKING_DIRECTORY ${prefix_home}/lib)" -) install(CODE "message(\"-- Created symlink: libcgroup.so.1 -> libcgroup.so\")") # fastcheck part diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 550dcd2959a6d92f6c886dfb616cdfd59d43bddc..a7b3ef052b485b46131e2dcc75d84d7168c5e54f 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -274,18 +274,13 @@ ifeq ($(with_3rd), NONE) INSTALL_TOOLS_PATH = binarylibs/install_tools COMPONENTPATH = binarylibs/component - JEMALLOC_HOME = $(top_builddir)/$(BINARYPATH)/jemalloc/$(JEMALLOC_BUILD_TYPE) MEMCHECK_HOME = $(top_builddir)/$(BINARYPATH)/memcheck/$(MEMCHECK_BUILD_TYPE) LIBOBS_HOME = $(top_builddir)/$(BINARYPATH)/libobs/$(LIB_NOT_SUPPORT_LLT) - LIBODBC_HOME = $(top_builddir)/$(BINARYPATH)/unixodbc - LIBXML_HOME = $(top_builddir)/$(BINARYPATH)/libxml2/$(LIB_SUPPORT_LLT) LIBHOTPATCH_HOME = $(top_builddir)/$(PLATFORMPATH)/hotpatch - LIBCGROUP_HOME = $(top_builddir)/$(BINARYPATH)/libcgroup/$(LIB_SUPPORT_LLT) LIBLLVM_HOME = $(top_builddir)/$(BINARYPATH)/llvm/comm XGBOOST_HOME = $(top_builddir)/$(BINARYPATH)/xgboost/comm EVENT_HOME = $(top_builddir)/$(BINARYPATH)/event/$(LIB_SUPPORT_LLT) ZLIB_HOME = $(top_builddir)/$(BINARYPATH)/zlib1.2.11/$(LIB_SUPPORT_LLT) - LZ4_HOME = $(top_builddir)/$(BINARYPATH)/lz4/$(LIB_SUPPORT_LLT) CJSON_HOME = $(top_builddir)/$(BINARYPATH)/cjson/$(LIB_SUPPORT_LLT) KERBEROS_HOME = $(top_builddir)/$(BINARYPATH)/kerberos/$(LIB_SUPPORT_LLT) BOOST_HOME = $(top_builddir)/$(BINARYPATH)/boost/$(LIB_SUPPORT_LLT) @@ -300,12 +295,9 @@ ifeq ($(with_3rd), NONE) LIBSTD_HOME = $(top_builddir)/$(BUILD_TOOLS_PATH)/libstd/gcc$(CC_VERSION)/$(LIB_NOT_SUPPORT_LLT) GTEST_HOME = $(top_builddir)/$(BUILD_TOOLS_PATH)/gtest/$(LIB_NOT_SUPPORT_LLT) MOCKCPP_HOME = $(top_builddir)/$(BUILD_TOOLS_PATH)/mockcpp/$(LIB_NOT_SUPPORT_LLT) - NUMA_HOME = $(top_builddir)/$(BINARYPATH)/numactl/$(LIB_SUPPORT_LLT) LIBCURL_HOME = $(top_builddir)/$(BINARYPATH)/libcurl/$(LIB_SUPPORT_LLT) AWSSDK_HOME = $(top_builddir)/$(BINARYPATH)/aws-sdk-cpp/$(LIB_SUPPORT_LLT) - ZSTD_HOME = $(top_builddir)/$(BINARYPATH)/zstd LIBNANOMSG_HOME = $(top_builddir)/$(BINARYPATH)/nng/comm - PLJAVA_HOME = $(top_builddir)/$(BINARYPATH)/pljava/$(LIB_SUPPORT_LLT) MASSTREE_HOME = $(top_builddir)/$(BINARYPATH)/masstree/comm MYFDW_HOME = $(top_builddir)/dependency/mysql_fdw ORCFDW_HOME = $(top_builddir)/dependency/oracle_fdw @@ -318,19 +310,14 @@ else PLATFORMPATH = kernel/platform BUILD_TOOLS_PATH = buildtools - JEMALLOC_HOME = $(with_3rd)/$(BINARYPATH)/jemalloc/$(JEMALLOC_BUILD_TYPE) MEMCHECK_HOME = $(with_3rd)/$(BINARYPATH)/memcheck/$(MEMCHECK_BUILD_TYPE) LIBOBS_HOME = $(with_3rd)/$(BINARYPATH)/libobs/$(LIB_NOT_SUPPORT_LLT) - LIBODBC_HOME = $(with_3rd)/$(BINARYPATH)/unixodbc - LIBXML_HOME = $(with_3rd)/$(BINARYPATH)/libxml2/$(LIB_SUPPORT_LLT) - LIBCGROUP_HOME = $(with_3rd)/$(BINARYPATH)/libcgroup/$(LIB_SUPPORT_LLT) LIBHOTPATCH_HOME = $(with_3rd)/$(PLATFORMPATH)/hotpatch LIBLLVM_HOME = $(with_3rd)/$(BINARYPATH)/llvm/comm XGBOOST_HOME = $(with_3rd)/$(BINARYPATH)/xgboost/$(LIB_SUPPORT_LLT) EVENT_HOME = $(with_3rd)/$(BINARYPATH)/event/$(LIB_SUPPORT_LLT) ZLIB_HOME = $(with_3rd)/$(BINARYPATH)/zlib1.2.11/$(LIB_SUPPORT_LLT) - LZ4_HOME = $(with_3rd)/$(BINARYPATH)/lz4/$(LIB_SUPPORT_LLT) CJSON_HOME = $(with_3rd)/$(BINARYPATH)/cjson/$(LIB_SUPPORT_LLT) KERBEROS_HOME = $(with_3rd)/$(BINARYPATH)/kerberos/$(LIB_SUPPORT_LLT) BOOST_HOME = $(with_3rd)/$(BINARYPATH)/boost/$(LIB_SUPPORT_LLT) @@ -351,18 +338,10 @@ endif LIBSTD_HOME = $(with_3rd)/$(BUILD_TOOLS_PATH)/libstd/gcc$(CC_VERSION)/$(LIB_NOT_SUPPORT_LLT) GTEST_HOME = $(with_3rd)/$(BUILD_TOOLS_PATH)/gtest/$(LIB_NOT_SUPPORT_LLT) MOCKCPP_HOME = $(with_3rd)/$(BUILD_TOOLS_PATH)/mockcpp/$(LIB_NOT_SUPPORT_LLT) - NUMA_HOME = $(with_3rd)/$(BINARYPATH)/numactl/$(LIB_SUPPORT_LLT) LIBCURL_HOME = $(with_3rd)/$(BINARYPATH)/libcurl/$(LIB_SUPPORT_LLT) AWSSDK_HOME = $(with_3rd)/$(BINARYPATH)/aws-sdk-cpp/$(LIB_SUPPORT_LLT) - ZSTD_HOME = $(with_3rd)/$(BINARYPATH)/zstd LIBNANOMSG_HOME = $(with_3rd)/$(BINARYPATH)/nng/comm - 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 - else - JAVA_HOME = $(with_3rd)/${PLATFORMPATH}/huaweijdk8/$(shell uname -p)/jdk - endif + JAVA_HOME = /usr/lib/jvm/java/ MASSTREE_HOME = $(with_3rd)/$(BINARYPATH)/masstree/comm MYFDW_HOME = $(with_3rd)/$(BINARYPATH)/mysql_fdw ORCFDW_HOME = $(with_3rd)/$(BINARYPATH)/oracle_fdw @@ -937,10 +916,8 @@ X = @EXEEXT@ ifeq ($(with_3rd), NONE) LIBTINFO_HOME = $(top_builddir)/$(BINARYPATH)/ncurses/comm - ETCD_HOME = $(top_builddir)/$(BINARYPATH)/etcd/comm else LIBTINFO_HOME = $(with_3rd)/$(BINARYPATH)/ncurses/comm - ETCD_HOME = $(with_3rd)/$(BINARYPATH)/etcd/comm endif ############################################################################# diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index 7b7c2633a5db81163be3d137553cd948e0fb90a8..8243437bf88ad186fd97b83bef62056367ab9db6 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -24,7 +24,6 @@ SGMLDIR= $(top_builddir)/doc/src/sgml ################################################################### # libedit component ################################################################### -LIBEDIT_HOME = $(with_3rd)/$(BINARYPATH)/libedit/$(LIB_SUPPORT_LLT) LIBEDIT_INCLUDE_PATH = $(LIBEDIT_HOME)/include LIBEDIT_LIB_PATH = $(LIBEDIT_HOME)/lib diff --git a/src/gausskernel/Makefile b/src/gausskernel/Makefile index eb0de1c0d594f2e19d2f622ac7169e7a12987bc5..193502a598f19d21138593f10f32a069ebbb714a 100755 --- a/src/gausskernel/Makefile +++ b/src/gausskernel/Makefile @@ -619,15 +619,11 @@ endif cp -d $(CJSON_LIB_PATH)/libcjson* '$(DESTDIR)$(libdir)/' ifneq ($(with_openeuler_os), yes) - cp -d $(LZ4_LIB_PATH)/liblz4* '$(DESTDIR)$(libdir)/' ifeq ($(enable_lite_mode), no) cp -d $(with_3rd)/$(BINARYPATH)/event/$(LIB_SUPPORT_LLT)/lib/libevent* '$(DESTDIR)$(libdir)/' endif cp $(SECUREDYNAMICLIB_HOME)/libsecurec* '$(DESTDIR)$(libdir)/' ifneq (, $(findstring __USE_NUMA, $(CFLAGS))) - cp $(ZSTD_LIB_PATH)/libzstd* '$(DESTDIR)$(libdir)/' - cp $(LIBODBC_LIB_PATH)/libodbc* '$(DESTDIR)$(libdir)/' - cp $(NUMA_LIB_PATH)/* '$(DESTDIR)$(libdir)/' endif ifeq ($(enable_mot), yes) cp -d $(MASSTREE_LIB_PATH)/libmasstree* '$(DESTDIR)$(libdir)/' @@ -666,9 +662,6 @@ endif ifeq ($(enable_lite_mode), no) cp -r $(with_jdk)/jre/* '$(DESTDIR)$(bindir)/../jre/' ifneq ($(host_cpu), loongarch64) - cp $(PLJAVA_LIB_PATH)/* '$(DESTDIR)$(libdir)/' - cp $(PLJAVA_JAR_PATH)/$(JARPLJAVA) '$(DESTDIR)$(pkglibdir)/java/' - cp $(PLJAVA_HOME)/udstools.py '$(DESTDIR)$(datadir)/tmp/' endif endif @@ -696,8 +689,6 @@ ifeq ($(enable_lite_mode), no) @if test -f $(top_builddir)/src/gausskernel/ddes/script/dss_contrl.sh; then cp $(top_builddir)/src/gausskernel/ddes/script/dss_contrl.sh $(DESTDIR)$(bindir)/dss_contrl.sh; fi endif endif - cp '$(ZSTD_LIB_PATH)'/libzstd.so* '$(DESTDIR)$(libdir)/' - cp '$(LIBODBC_LIB_PATH)'/libodbc* '$(DESTDIR)$(libdir)/' cp -d '$(LIBCURL_LIB_PATH)'/libcurl.so* '$(DESTDIR)$(libdir)/' cp -d '$(AWSSDK_LIB_PATH)'/libaws-cpp-sdk-core.so* '$(DESTDIR)$(libdir)/' cp -d '$(AWSSDK_LIB_PATH)'/libaws-cpp-sdk-s3.so* '$(DESTDIR)$(libdir)/' @@ -785,7 +776,6 @@ endif libcgroup: cd $(DESTDIR)$(libdir) && rm -f libcgroup.* ifneq ($(with_openeuler_os), yes) - cp $(LIBCGROUP_LIB_PATH)/$(LIBCGROUP) '$(DESTDIR)$(libdir)/$(LIBCGROUP)' cd $(DESTDIR)$(libdir) && $(LN_S) $(LIBCGROUP) libcgroup.so.1 endif