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

!3687 轻量级包构建脚本优化

Browse Source 
Merge pull request !3687 from Cross-罗/comp_upgrade
This commit is contained in:
opengauss_bot
2023-07-13 03:18:16 +00:00
committed by Gitee
parent b7eacfd741 a85a97003f
commit 4199f3d9ec
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -56,14 +56,23 @@ set(prefix_home $ENV{PREFIX_HOME})
set(CMAKE_INSTALL_PREFIX ${prefix_home} CACHE INTERNAL "") set(CMAKE_INSTALL_PREFIX ${prefix_home} CACHE INTERNAL "")
if("$ENV{GCC_VERSION}" STREQUAL "") if("$ENV{GCC_VERSION}" STREQUAL "")
execute_process(COMMAND gcc --version OUTPUT_VARIABLE GCC_VERSION_INFO OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND gcc --version OUTPUT_VARIABLE GCC_VERSION_INFO OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REPLACE "\n" " " GCC_VERSION_INFO_TMP ${GCC_VERSION_INFO}) string(REPLACE "\n" ";" GCC_VERSION_INFO_TMP ${GCC_VERSION_INFO})
string(REPLACE " " ";" GCC_VERSION_INFO_LIST ${GCC_VERSION_INFO_TMP}) list(GET GCC_VERSION_INFO_TMP 0 GCC_VERSION_INFO_FIRSTLINE)
list(GET GCC_VERSION_INFO_LIST 2 GCC_VERSION) string(REPLACE " " ";" GCC_VERSION_INFO_LIST ${GCC_VERSION_INFO_FIRSTLINE})
list(POP_BACK GCC_VERSION_INFO_LIST GCC_VERSION)
else() else()
set(GCC_VERSION $ENV{GCC_VERSION}) set(GCC_VERSION $ENV{GCC_VERSION})
endif() endif()
MESSAGE(STATUS "The current gcc version is: ${GCC_VERSION}")
if("${GCC_VERSION}" STREQUAL "7.3.0") if("${GCC_VERSION}" STREQUAL "7.3.0")
set(GCC_VERSION_LIT 7.3) set(GCC_VERSION_LIT 7.3)
set(LIBSTD_SUB_VERSION 24)
elseif("${GCC_VERSION}" STREQUAL "10.3.1")
set(GCC_VERSION_LIT 10.3)
set(LIBSTD_SUB_VERSION 28)
elseif("${GCC_VERSION}" STREQUAL "10.3.0")
set(GCC_VERSION_LIT 10.3)
set(LIBSTD_SUB_VERSION 28)
endif() endif()
if("$ENV{BUILD_TUPLE}" STREQUAL "") if("$ENV{BUILD_TUPLE}" STREQUAL "")

6
build/script/cmake_package_mini.sh
View File

@ -53,7 +53,7 @@ else
fi fi
show_package=false show_package=false
gcc_version="7.3.0" gcc_version="10.3.1"
##add platform architecture information ##add platform architecture information
cpus_num=$(grep -w processor /proc/cpuinfo|wc -l) cpus_num=$(grep -w processor /proc/cpuinfo|wc -l)
@ -269,9 +269,9 @@ done
read_mpp_version read_mpp_version
if [ "$gcc_version" = "7.3.0" ]; then if [ "$gcc_version" == "7.3.0" ]; then
gcc_version=${gcc_version:0:3} gcc_version=${gcc_version:0:3}
elif [ "$gcc_version" = "10.3.0" ] || [ "$gcc_version" = "10.3.1" ]; then elif [ "$gcc_version" == "10.3.0" ] || [ "$gcc_version" == "10.3.1" ]; then
gcc_version=${gcc_version:0:4} gcc_version=${gcc_version:0:4}
else else
echo "Unknown gcc version $gcc_version" echo "Unknown gcc version $gcc_version"

12
src/CMakeLists.txt
View File

@ -242,7 +242,7 @@ endif()
if("${ENABLE_MOT}" STREQUAL "ON") if("${ENABLE_MOT}" STREQUAL "ON")
install(DIRECTORY ${MASSTREE_LIB_PATH} DESTINATION .) install(DIRECTORY ${MASSTREE_LIB_PATH} DESTINATION .)
install(CODE "execute_process( install(CODE "execute_process(
COMMAND cp ${BUILDTOOLS_PATH}/gcc7.3/gcc/lib64/libatomic.so.1.2.0 ${prefix_home}/lib/libatomic.so.1.2.0 COMMAND cp ${GCC_LIB_PATH}/lib64/libatomic.so.1.2.0 ${prefix_home}/lib/libatomic.so.1.2.0
COMMAND ln -fs libatomic.so.1.2.0 libatomic.so COMMAND ln -fs libatomic.so.1.2.0 libatomic.so
COMMAND ln -fs libatomic.so.1.2.0 libatomic.so.1 COMMAND ln -fs libatomic.so.1.2.0 libatomic.so.1
WORKING_DIRECTORY ${prefix_home}/lib)" WORKING_DIRECTORY ${prefix_home}/lib)"
@ -252,10 +252,10 @@ install(CODE "message(\"-- Created symlink: libatomic.so.1 -> libatomic.so.1.2.0
endif() endif()
install(FILES ${SECUREDYNAMICLIB_HOME}/libsecurec.so DESTINATION lib) install(FILES ${SECUREDYNAMICLIB_HOME}/libsecurec.so DESTINATION lib)
install(FILES ${BUILDTOOLS_PATH}/gcc7.3/gcc/lib64/libgcc_s.so.1 DESTINATION lib) install(FILES ${GCC_LIB_PATH}/lib64/libgcc_s.so.1 DESTINATION lib)
install(FILES ${BUILDTOOLS_PATH}/gcc7.3/gcc/lib64/libgomp.so DESTINATION lib) install(FILES ${GCC_LIB_PATH}/lib64/libgomp.so DESTINATION lib)
install(FILES ${BUILDTOOLS_PATH}/gcc7.3/gcc/lib64/libgomp.so.1 DESTINATION lib) install(FILES ${GCC_LIB_PATH}/lib64/libgomp.so.1 DESTINATION lib)
install(FILES ${BUILDTOOLS_PATH}/gcc7.3/gcc/lib64/libgomp.so.1.0.0 DESTINATION lib) install(FILES ${GCC_LIB_PATH}/lib64/libgomp.so.1.0.0 DESTINATION lib)
install(FILES ${XGBOOST_LIB_PATH}/libxgboost.so DESTINATION lib) install(FILES ${XGBOOST_LIB_PATH}/libxgboost.so DESTINATION lib)
if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON") if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON")
install(FILES ${PLJAVA_HOME}/lib/libpljava.so DESTINATION lib) install(FILES ${PLJAVA_HOME}/lib/libpljava.so DESTINATION lib)
@ -279,7 +279,7 @@ install(DIRECTORY ${GCC_LIB_PATH}/lib64/ DESTINATION lib
FILES_MATCHING PATTERN "libgomp.so*") FILES_MATCHING PATTERN "libgomp.so*")
install(CODE "execute_process( install(CODE "execute_process(
COMMAND cp ${GCC_LIB_PATH}/lib64/libstdc++.so.6.0.24 ${prefix_home}/lib/libstdc++.so.6 COMMAND cp ${GCC_LIB_PATH}/lib64/libstdc++.so.6.0.${LIBSTD_SUB_VERSION} ${prefix_home}/lib/libstdc++.so.6
WORKING_DIRECTORY ${prefix_home}/lib)" WORKING_DIRECTORY ${prefix_home}/lib)"
) )