diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..b48863478a2cd7e5e78b194e7400f6ff6fcd5ae6 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +dmlc-core-v0.5.tar.gz filter=lfs diff=lfs merge=lfs -text +krb5-1.18.3-final.tar.gz filter=lfs diff=lfs merge=lfs -text +openGauss-server-6.0.0.tar.gz filter=lfs diff=lfs merge=lfs -text +xgboost-v1.4.1.tar.gz filter=lfs diff=lfs merge=lfs -text +zlib-1.2.12.tar.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..08b26aee6415e28d883a1aabc7e3617c104847d7 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/opengauss-server diff --git a/dmlc-core-port-to-newer-cmake.patch b/dmlc-core-port-to-newer-cmake.patch new file mode 100644 index 0000000000000000000000000000000000000000..8dcf487d1552efecaa58d7deb733acd63f7e6609 --- /dev/null +++ b/dmlc-core-port-to-newer-cmake.patch @@ -0,0 +1,8 @@ +--- dmlc-core-0.5/CMakeLists.txt.orig 2025-03-12 09:50:11.043991872 +0800 ++++ dmlc-core-0.5/CMakeLists.txt 2025-03-12 09:50:18.250094059 +0800 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.2) ++cmake_minimum_required(VERSION 3.2...${CMAKE_VERSION}) + + project(dmlc VERSION 0.3 LANGUAGES C CXX) + diff --git a/dmlc-core-v0.5.tar.gz b/dmlc-core-v0.5.tar.gz index 4ae14b2d186bef195e0c7162d0ac0ffd24da029a..c9a3dd5cde7372207f7e3213a2f863150e472965 100644 Binary files a/dmlc-core-v0.5.tar.gz and b/dmlc-core-v0.5.tar.gz differ diff --git a/krb5-1.18.3-final.tar.gz b/krb5-1.18.3-final.tar.gz index df109f9ddc4b85f9d513fad1464d5ca98dfa461b..82525ca8385f1af43a9becc35fe10acdb9c699cd 100644 Binary files a/krb5-1.18.3-final.tar.gz and b/krb5-1.18.3-final.tar.gz differ diff --git a/openGauss-server-6.0.0.tar.gz b/openGauss-server-6.0.0.tar.gz index 053a1e0ef2c63599322bc6356a198fbb23d026da..ea2e37d48cc2d8ebc3c1631272eb482b35505c73 100644 Binary files a/openGauss-server-6.0.0.tar.gz and b/openGauss-server-6.0.0.tar.gz differ diff --git a/opengauss-server.spec b/opengauss-server.spec index 982983656ebb622c95a4d79f912f0829d0c82175..8a4c7fe52c3e58266933cb6345f2a656cc4eb03f 100755 --- a/opengauss-server.spec +++ b/opengauss-server.spec @@ -3,9 +3,9 @@ %define krb5_name krb5 %define krb5_version 1.18.3-final %define xgboost_name xgboost -%define xgboost_version v1.4.1 +%define xgboost_version 1.4.1 %define dmlc_name dmlc-core -%define dmlc_version v0.5 +%define dmlc_version 0.5 %define port 7654 %define datapath /var/lib/opengauss %define apppath %{_prefix}/local/opengauss @@ -13,15 +13,15 @@ Name: opengauss Version: 6.0.0 -Release: 23 +Release: 24 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 Source0: openGauss-server-%{version}.tar.gz Source1: %{zlib_name}-%{zlib_version}.tar.gz Source2: %{krb5_name}-%{krb5_version}.tar.gz -Source3: %{dmlc_name}-%{dmlc_version}.tar.gz -Source4: %{xgboost_name}-%{xgboost_version}.tar.gz +Source3: %{dmlc_name}-v%{dmlc_version}.tar.gz +Source4: %{xgboost_name}-v%{xgboost_version}.tar.gz Source20: opengauss-bashprofile Source21: opengauss.service @@ -48,6 +48,8 @@ Patch22: krb5-backport-CVE-2024-37370-CVE-2024-37371-Fix-vulnerabilities- Patch23: krb5-cve-2022-42898.patch Patch24: krb5-CVE-2023-36054.patch Patch25: krb5.patch +Patch26: xgboost-cmake-3.13.patch +Patch27: dmlc-core-port-to-newer-cmake.patch BuildRequires: cmake gcc gcc-c++ openssl-devel python tar BuildRequires: lz4-devel zstd-devel boost-devel cjson-devel @@ -102,6 +104,14 @@ pushd %{krb5_name}-%{krb5_name}-%{krb5_version} %patch -P25 -p1 popd +pushd %{xgboost_name}-%{xgboost_version} +%patch -P26 -p1 +popd + +pushd %{dmlc_name}-%{dmlc_version} +%patch -P27 -p1 +popd + %build build_target=$(pwd)/binarylibs/kernel/dependency @@ -160,7 +170,7 @@ cp -r ${zlib_dir} ${build_target}/zlib1.2.11/llt popd ########### build xgboost ########### -pushd %{xgboost_name}-1.4.1 +pushd %{xgboost_name}-%{xgboost_version} xgboost_dir=${build_target}/xgboost/comm sed -i '9a set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,now -fPIE -fPIC -fstack-protector-strong")' ./CMakeLists.txt @@ -168,7 +178,7 @@ sed -i '10a set (CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wl,-z,now -fPIE -fPIC -fst sed -i '11a set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,now -fPIE -fPIC -fstack-protector-strong")' ./CMakeLists.txt rm -rf dmlc-core -cp -r ../dmlc-core-0.5/ ./dmlc-core +cp -r ../dmlc-core-%{dmlc_version}/ ./dmlc-core rm -rf build_install mkdir build_install && cd build_install @@ -472,6 +482,9 @@ fi %changelog +* Wed Mar 12 2025 Funda Wang - 6.0.0-24 +- fix build with cmake 4.0 + * Sat Dec 28 2024 liuheng - 6.0.0-23 - Fix bugs: upgrade failed diff --git a/xgboost-cmake-3.13.patch b/xgboost-cmake-3.13.patch new file mode 100644 index 0000000000000000000000000000000000000000..92452fd1534bd2df82611fb72bb9f977f900f324 --- /dev/null +++ b/xgboost-cmake-3.13.patch @@ -0,0 +1,8 @@ +--- xgboost-1.4.1/rabit/CMakeLists.txt.orig 2025-03-12 09:39:22.266791744 +0800 ++++ xgboost-1.4.1/rabit/CMakeLists.txt 2025-03-12 09:39:47.096143841 +0800 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.3) ++cmake_minimum_required(VERSION 3.13) + + find_package(Threads REQUIRED) + diff --git a/xgboost-v1.4.1.tar.gz b/xgboost-v1.4.1.tar.gz index 12a8bef753ff766112a6fe7aee96d87b2bf40fcb..10c7beb6cb4fccd5492adf1a6d973bb85a57d122 100644 Binary files a/xgboost-v1.4.1.tar.gz and b/xgboost-v1.4.1.tar.gz differ diff --git a/zlib-1.2.12.tar.gz b/zlib-1.2.12.tar.gz index 4df1cf58fc97c06667a26b81a94314710378e36b..f3a3c63c7e05ad46d2ad9eb05a9e4cc9119a6068 100644 Binary files a/zlib-1.2.12.tar.gz and b/zlib-1.2.12.tar.gz differ