From 66b5a2c0030f03fdac1913ba8962f767336272d3 Mon Sep 17 00:00:00 2001 From: zhangxubo Date: Wed, 10 Sep 2025 09:56:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=80=89=E9=A1=B9-strip=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- og-cmake.patch | 150 ++++++++++++++++++++++-------------------- opengauss-server.spec | 5 +- 2 files changed, 82 insertions(+), 73 deletions(-) diff --git a/og-cmake.patch b/og-cmake.patch index 67cc923..98402ab 100644 --- a/og-cmake.patch +++ b/og-cmake.patch @@ -1,6 +1,6 @@ -diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' opengauss_server_600/cmake/src/set_thirdparty_path.cmake opengauss_server_600_edit/cmake/src/set_thirdparty_path.cmake -*** opengauss_server_600/cmake/src/set_thirdparty_path.cmake 2024-11-19 20:01:27.693621300 +0800 ---- opengauss_server_600_edit/cmake/src/set_thirdparty_path.cmake 2024-11-21 20:14:05.645621300 +0800 +diff -crN '--exclude=.git' openGauss-server-6.0.0/cmake/src/set_thirdparty_path.cmake openGauss-server-6.0.0_cmake/cmake/src/set_thirdparty_path.cmake +*** openGauss-server-6.0.0/cmake/src/set_thirdparty_path.cmake 2024-11-27 16:17:35.000000000 +0800 +--- openGauss-server-6.0.0_cmake/cmake/src/set_thirdparty_path.cmake 2025-09-09 10:51:26.552376550 +0800 *************** *** 36,105 **** set(LIB_UNIFIED_SUPPORT comm) @@ -148,9 +148,9 @@ diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' opengauss_serv ############################################################################# # lz4 component -diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' opengauss_server_600/src/CMakeLists.txt opengauss_server_600_edit/src/CMakeLists.txt -*** opengauss_server_600/src/CMakeLists.txt 2024-11-19 20:01:27.693621300 +0800 ---- opengauss_server_600_edit/src/CMakeLists.txt 2024-11-21 20:14:05.841621300 +0800 +diff -crN '--exclude=.git' openGauss-server-6.0.0/src/CMakeLists.txt openGauss-server-6.0.0_cmake/src/CMakeLists.txt +*** openGauss-server-6.0.0/src/CMakeLists.txt 2024-11-27 16:17:35.000000000 +0800 +--- openGauss-server-6.0.0_cmake/src/CMakeLists.txt 2025-09-09 19:27:10.259437081 +0800 *************** *** 176,297 **** install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/common/config/cm_config.h DESTINATION include) @@ -205,87 +205,93 @@ diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' opengauss_serv - install(DIRECTORY ${LIBCURL_LIB_PATH} DESTINATION .) - install(DIRECTORY ${AWSSDK_LIB_PATH} DESTINATION .) - if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON") - install(DIRECTORY ${KERBEROS_SBIN_PATH}/ DESTINATION bin) - install(DIRECTORY ${KERBEROS_BIN_PATH} DESTINATION .) +- install(DIRECTORY ${KERBEROS_SBIN_PATH}/ DESTINATION bin) +- 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.*") -- +! 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 .) -- install(CODE "execute_process( -- 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.1 -- WORKING_DIRECTORY ${prefix_home}/lib)" -- ) -- install(CODE "message(\"-- Created symlink: libatomic.so -> libatomic.so.1.2.0\")") -- install(CODE "message(\"-- Created symlink: libatomic.so.1 -> libatomic.so.1.2.0\")") -- endif() -- -- install(FILES ${SECUREDYNAMICLIB_HOME}/libsecurec.so DESTINATION lib) -- install(FILES ${GCC_LIB_PATH}/lib64/libgcc_s.so.1 DESTINATION lib) -- 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) -- endif() -- endif() -- -- if("${ENABLE_MOT}" STREQUAL "ON") -- install(DIRECTORY ${MASSTREE_LIB_PATH} DESTINATION .) -- install(DIRECTORY ${GCC_LIB_PATH}/lib64/ DESTINATION lib -- FILES_MATCHING PATTERN "libatomic.so*") -- endif() -- -- install(FILES ${GCC_LIB_PATH}/lib64/libgcc_s.so.1 DESTINATION lib) -- install(DIRECTORY ${GCC_LIB_PATH}/lib64/ DESTINATION lib -- FILES_MATCHING PATTERN "libgomp.so*") -- -- install(CODE "execute_process( -- COMMAND cp ${GCC_LIB_PATH}/lib64/libstdc++.so.6.0.${LIBSTD_SUB_VERSION} ${prefix_home}/lib/libstdc++.so.6 -- WORKING_DIRECTORY ${prefix_home}/lib)" -- ) -- -- # 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\")") + endif() +! +! if("${ENABLE_MOT}" STREQUAL "ON") +! install(DIRECTORY ${MASSTREE_LIB_PATH} DESTINATION .) +! install(CODE "execute_process( +! 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.1 +! WORKING_DIRECTORY ${prefix_home}/lib)" +! ) +! install(CODE "message(\"-- Created symlink: libatomic.so -> libatomic.so.1.2.0\")") +! install(CODE "message(\"-- Created symlink: libatomic.so.1 -> libatomic.so.1.2.0\")") +! endif() +! +! install(FILES ${SECUREDYNAMICLIB_HOME}/libsecurec.so DESTINATION lib) +! install(FILES ${GCC_LIB_PATH}/lib64/libgcc_s.so.1 DESTINATION lib) +! 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) +! endif() +! endif() +! +! if("${ENABLE_MOT}" STREQUAL "ON") +! install(DIRECTORY ${MASSTREE_LIB_PATH} DESTINATION .) +! install(DIRECTORY ${GCC_LIB_PATH}/lib64/ DESTINATION lib +! FILES_MATCHING PATTERN "libatomic.so*") +! endif() +! +! install(FILES ${GCC_LIB_PATH}/lib64/libgcc_s.so.1 DESTINATION lib) +! install(DIRECTORY ${GCC_LIB_PATH}/lib64/ DESTINATION lib +! FILES_MATCHING PATTERN "libgomp.so*") +! +! install(CODE "execute_process( +! COMMAND cp ${GCC_LIB_PATH}/lib64/libstdc++.so.6.0.${LIBSTD_SUB_VERSION} ${prefix_home}/lib/libstdc++.so.6 +! WORKING_DIRECTORY ${prefix_home}/lib)" +! ) +! +! # 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 install(FILES ${PROJECT_SRC_DIR}/test/regress/stub/roach_api_stub/roach_api_stub.control DESTINATION share/postgresql/extension/ ---- 176,190 ---- +--- 176,196 ---- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/common/config/cm_config.h DESTINATION include) # special # open source install part if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON") - install(DIRECTORY ${KERBEROS_SBIN_PATH}/ DESTINATION bin) - install(DIRECTORY ${KERBEROS_BIN_PATH} DESTINATION .) install(DIRECTORY ${KERBEROS_LIB_PATH} DESTINATION .) +! install(PROGRAMS ${KERBEROS_BIN_PATH}/klist DESTINATION bin) +! install(PROGRAMS ${KERBEROS_BIN_PATH}/kinit DESTINATION bin) +! install(PROGRAMS ${KERBEROS_BIN_PATH}/kdestroy DESTINATION bin) +! install(PROGRAMS ${KERBEROS_SBIN_PATH}/kdb5_util DESTINATION bin) +! install(PROGRAMS ${KERBEROS_SBIN_PATH}/krb5kdc DESTINATION bin) +! install(PROGRAMS ${KERBEROS_SBIN_PATH}/kadmin.local DESTINATION bin) +! install(PROGRAMS ${KERBEROS_SBIN_PATH}/kadmind DESTINATION bin) + endif() - install(DIRECTORY ${ZLIB_LIB_PATH} DESTINATION . FILES_MATCHING PATTERN "libz.*") +! install(DIRECTORY ${ZLIB_LIB_PATH} DESTINATION . FILES_MATCHING PATTERN "libz.*") + install(FILES ${XGBOOST_LIB_PATH}/libxgboost.so DESTINATION lib) # fastcheck part diff --git a/opengauss-server.spec b/opengauss-server.spec index 8a4c7fe..caba06e 100755 --- a/opengauss-server.spec +++ b/opengauss-server.spec @@ -13,7 +13,7 @@ Name: opengauss Version: 6.0.0 -Release: 24 +Release: 25 Summary: openGauss is an open source relational database management system License: MulanPSL-2.0 and MIT and BSD and zlib and TCL and Apache-2.0 and BSL-1.0 URL: https://gitee.com/opengauss/openGauss-server @@ -482,6 +482,9 @@ fi %changelog +* Wed Sep 10 2025 zhangxubo - 6.0.0-25 +- Fix bugs: #ICUX7L Safe compilation option strip adapt + * Wed Mar 12 2025 Funda Wang - 6.0.0-24 - fix build with cmake 4.0 -- Gitee