diff --git a/01-boundcheck.patch b/01-boundcheck.patch index b127ece0f7d125052c2e1a068470cd75c9d594d4..d5d1da91f6b8036f8bfc9d7e8d5f1936c0e529ee 100644 --- a/01-boundcheck.patch +++ b/01-boundcheck.patch @@ -1,53 +1,53 @@ -diff -crN '--exclude=.git' DCF-1.0.0-org/CMakeLists.txt DCF/CMakeLists.txt -*** DCF-1.0.0-org/CMakeLists.txt 2021-11-30 11:22:45.072192931 +0800 ---- DCF/CMakeLists.txt 2021-11-30 11:36:31.164889527 +0800 +diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-5.0.1/CMakeLists.txt DCF-5.0.1-edit/CMakeLists.txt +*** DCF-5.0.1/CMakeLists.txt 2024-05-07 17:22:01.091857616 +0800 +--- DCF-5.0.1-edit/CMakeLists.txt 2024-05-07 17:20:19.623110156 +0800 *************** *** 10,16 **** set(CJSON_PATH "${DCF_LIBRARY}/cJSON/lib") set(VERSION_SRC ${PROJECT_SOURCE_DIR}/src/dcf_version.c) - + ! set(vpp_libsecurec "securec") - + set(CMAKE_INSTALL_PREFIX $ENV{dcf_install_prefix}) - + --- 10,16 ---- set(CJSON_PATH "${DCF_LIBRARY}/cJSON/lib") set(VERSION_SRC ${PROJECT_SOURCE_DIR}/src/dcf_version.c) - + ! set(vpp_libsecurec "boundscheck") - + set(CMAKE_INSTALL_PREFIX $ENV{dcf_install_prefix}) - -diff -crN '--exclude=.git' DCF-1.0.0-org/src/dcf_interface.c DCF/src/dcf_interface.c -*** DCF-1.0.0-org/src/dcf_interface.c 2021-11-30 11:22:45.080193015 +0800 ---- DCF/src/dcf_interface.c 2021-11-30 11:37:16.053362085 +0800 + +diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-5.0.1/src/dcf_interface.c DCF-5.0.1-edit/src/dcf_interface.c +*** DCF-5.0.1/src/dcf_interface.c 2024-05-07 17:22:01.099857675 +0800 +--- DCF-5.0.1-edit/src/dcf_interface.c 2024-05-07 17:20:19.631110215 +0800 *************** -*** 38,44 **** - #include "elc_stream.h" +*** 39,45 **** + #include "elc_status_check.h" #include "util_perf_stat.h" #include "cm_ip.h" ! #include "cJSON.h" #include "util_profile_stat.h" #include "stream.h" #include "cb_func.h" ---- 38,44 ---- - #include "elc_stream.h" +--- 39,45 ---- + #include "elc_status_check.h" #include "util_perf_stat.h" #include "cm_ip.h" ! #include "cjson/cJSON.h" #include "util_profile_stat.h" #include "stream.h" #include "cb_func.h" -diff -crN '--exclude=.git' DCF-1.0.0-org/src/metadata/metadata.c DCF/src/metadata/metadata.c -*** DCF-1.0.0-org/src/metadata/metadata.c 2021-11-30 11:22:45.080193015 +0800 ---- DCF/src/metadata/metadata.c 2021-11-30 11:37:34.153552633 +0800 +diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-5.0.1/src/metadata/metadata.c DCF-5.0.1-edit/src/metadata/metadata.c +*** DCF-5.0.1/src/metadata/metadata.c 2024-05-07 17:22:01.103857704 +0800 +--- DCF-5.0.1-edit/src/metadata/metadata.c 2024-05-07 17:20:19.635110245 +0800 *************** *** 32,38 **** #include "md_stream.h" #include "md_param.h" #include "md_store.h" ! #include "cJSON.h" - + #ifdef __cplusplus extern "C" { --- 32,38 ---- @@ -55,26 +55,26 @@ diff -crN '--exclude=.git' DCF-1.0.0-org/src/metadata/metadata.c DCF/src/metadat #include "md_param.h" #include "md_store.h" ! #include "cjson/cJSON.h" - + #ifdef __cplusplus extern "C" { -diff -crN '--exclude=.git' DCF-1.0.0-org/src/utils/util_profile_stat.h DCF/src/utils/util_profile_stat.h -*** DCF-1.0.0-org/src/utils/util_profile_stat.h 2021-11-30 11:22:45.084193057 +0800 ---- DCF/src/utils/util_profile_stat.h 2021-11-30 11:37:25.201458391 +0800 +diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-5.0.1/src/utils/util_profile_stat.h DCF-5.0.1-edit/src/utils/util_profile_stat.h +*** DCF-5.0.1/src/utils/util_profile_stat.h 2024-05-07 17:22:01.107857734 +0800 +--- DCF-5.0.1-edit/src/utils/util_profile_stat.h 2024-05-07 17:20:19.639110274 +0800 *************** *** 37,43 **** #include "cm_num.h" #include "cm_latch.h" #include "cm_file.h" ! #include "cJSON.h" - - + + #define DEFAULT_STAT_INTERVAL 3 #define MAX_ITEM_COUNT 100 --- 37,43 ---- #include "cm_num.h" #include "cm_latch.h" #include "cm_file.h" ! #include "cjson/cJSON.h" - - + + #define DEFAULT_STAT_INTERVAL 3 #define MAX_ITEM_COUNT 100 diff --git a/DCF-1.0.0.tar.gz b/DCF-1.0.0.tar.gz deleted file mode 100644 index 22052d6194293da55e5f3e038f95d032bc1b85ee..0000000000000000000000000000000000000000 Binary files a/DCF-1.0.0.tar.gz and /dev/null differ diff --git a/DCF-5.0.1.tar.gz b/DCF-5.0.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f5b804d00e2d8857d906249da431afda5de92f52 Binary files /dev/null and b/DCF-5.0.1.tar.gz differ diff --git a/opengauss-dcf.spec b/opengauss-dcf.spec index a773f9c01381152ad3566e7cd669e9f2f40a7b1e..3282687929d165ac56a0c268bdb7609a0e202213 100644 --- a/opengauss-dcf.spec +++ b/opengauss-dcf.spec @@ -1,6 +1,6 @@ Name: DCF -Version: 1.0.0 -Release: 6 +Version: 5.0.1 +Release: 7 Summary: A distributed consensus framework library License: MulanPSL-2.0 URL: https://gitee.com/opengauss/DCF @@ -8,8 +8,7 @@ Source0: %{name}-%{version}.tar.gz Patch1: 01-boundcheck.patch Patch2: DCF-1.0.0-sw.patch -Patch3: DCF-1.0.0-add-loongarch64-support.patch -Patch4: DCF-1.0.0-add-riscv64-support.patch +Patch3: 0001-add-loongarch64-support.patch BuildRequires: cmake gcc gcc-c++ lz4-devel openssl-devel zstd-devel libboundscheck cjson-devel @@ -27,28 +26,17 @@ DCF is A distributed consensus framework library for openGauss %ifarch loongarch64 %patch3 -p1 %endif -%ifarch riscv64 -%patch4 -p1 -%endif %build -cmake -DCMAKE_BUILD_TYPE=Release -DUSE32BIT=OFF -DTEST=OFF -DENABLE_EXPORT_API=OFF CMakeLists.txt +cmake -DCMAKE_BUILD_TYPE=Release -DTEST=OFF -DENABLE_EXPORT_API=OFF CMakeLists.txt %make_build all -s %{?_smp_mflags} %install mkdir -p %{buildroot}/%{_prefix}/include -%ifarch sw_64 -mkdir -p %{buildroot}/%{_prefix}/lib -%else -mkdir -p %{buildroot}/%{_prefix}/lib64 -%endif +mkdir -p %{buildroot}/%{_libdir} cp src/interface/dcf_interface.h %{buildroot}/%{_prefix}/include -%ifarch sw_64 -cp output/lib/libdcf.* %{buildroot}/%{_prefix}/lib -%else -cp output/lib/libdcf.* %{buildroot}/%{_prefix}/lib64 -%endif +cp output/lib/libdcf.* %{buildroot}/%{_libdir} %post @@ -57,13 +45,12 @@ cp output/lib/libdcf.* %{buildroot}/%{_prefix}/lib64 %files %defattr (-,root,root) %{_prefix}/include/dcf_interface.h -%ifarch sw_64 -%{_prefix}/lib/libdcf.so -%else -%{_prefix}/lib64/libdcf.so -%endif +%{_libdir}/libdcf.so %changelog +* Mon May 6 2024 liuheng - 5.0.1-7 +- Update version to 5.0.1 + * Fri Jul 28 2023 misaka00251 - 1.0.0-6 - Add riscv64 support