diff --git a/0001-add-loongarch64-support-for-ucx.patch b/0001-add-loongarch64-support-for-ucx.patch index 21535759209ca8b7386f972727a27721eec55ff6..e3389c594291e07f23cc7671f0d24237e8b2ffc2 100644 --- a/0001-add-loongarch64-support-for-ucx.patch +++ b/0001-add-loongarch64-support-for-ucx.patch @@ -332,7 +332,7 @@ index 7768002..d893f3c 100644 arch/ppc64/cpu.h \ arch/x86_64/cpu.h \ @@ -134,6 +137,7 @@ libucs_la_SOURCES = \ - algorithm/qsort_r.c \ + algorithm/string_distance.c \ arch/aarch64/cpu.c \ arch/aarch64/global_opts.c \ + arch/loongarch64/global_opts.c \ @@ -344,16 +344,16 @@ index 34fcd02..54855dd 100644 --- a/src/ucs/Makefile.in +++ b/src/ucs/Makefile.in @@ -202,6 +202,7 @@ am__libucs_la_SOURCES_DIST = algorithm/crc.c algorithm/qsort_r.c \ - arch/aarch64/cpu.c arch/aarch64/global_opts.c \ - arch/ppc64/timebase.c arch/ppc64/global_opts.c \ - arch/x86_64/cpu.c arch/x86_64/global_opts.c arch/cpu.c \ + algorithm/string_distance.c arch/aarch64/cpu.c \ + arch/aarch64/global_opts.c arch/ppc64/timebase.c \ + arch/ppc64/global_opts.c arch/x86_64/cpu.c \ + arch/loongarch64/global_opts.c \ - async/async.c async/signal.c async/pipe.c async/thread.c \ - config/global_opts.c config/ucm_opts.c config/ini.c \ - config/parser.c datastruct/arbiter.c datastruct/array.c \ + arch/x86_64/global_opts.c arch/cpu.c async/async.c \ + async/signal.c async/pipe.c async/eventfd.c async/thread.c \ + config/global_opts.c config/ucm_opts.c config/ini.c \ @@ -229,6 +230,7 @@ am__dirstamp = $(am__leading_dot)dirstamp - am_libucs_la_OBJECTS = algorithm/libucs_la-crc.lo \ - algorithm/libucs_la-qsort_r.lo arch/aarch64/libucs_la-cpu.lo \ + algorithm/libucs_la-string_distance.lo \ + arch/aarch64/libucs_la-cpu.lo \ arch/aarch64/libucs_la-global_opts.lo \ + arch/loongarch64/libucs_la-global_opts.lo \ arch/ppc64/libucs_la-timebase.lo \ @@ -383,13 +383,13 @@ index 34fcd02..54855dd 100644 arch/ppc64/cpu.h \ arch/x86_64/cpu.h \ @@ -751,6 +756,7 @@ libucs_la_SOURCES = algorithm/crc.c algorithm/qsort_r.c \ - arch/aarch64/cpu.c arch/aarch64/global_opts.c \ - arch/ppc64/timebase.c arch/ppc64/global_opts.c \ - arch/x86_64/cpu.c arch/x86_64/global_opts.c arch/cpu.c \ + algorithm/string_distance.c arch/aarch64/cpu.c \ + arch/aarch64/global_opts.c arch/ppc64/timebase.c \ + arch/ppc64/global_opts.c arch/x86_64/cpu.c \ + arch/loongarch64/global_opts.c \ - async/async.c async/signal.c async/pipe.c async/thread.c \ - config/global_opts.c config/ucm_opts.c config/ini.c \ - config/parser.c datastruct/arbiter.c datastruct/array.c \ + arch/x86_64/global_opts.c arch/cpu.c async/async.c \ + async/signal.c async/pipe.c async/eventfd.c async/thread.c \ + config/global_opts.c config/ucm_opts.c config/ini.c \ @@ -868,6 +874,16 @@ arch/aarch64/libucs_la-cpu.lo: arch/aarch64/$(am__dirstamp) \ arch/aarch64/$(DEPDIR)/$(am__dirstamp) arch/aarch64/libucs_la-global_opts.lo: arch/aarch64/$(am__dirstamp) \ diff --git a/0001-replace-PTR-with-void.patch b/0001-replace-PTR-with-void.patch deleted file mode 100644 index 2785e1f4945b4901d825e370a8efe009564b9f9e..0000000000000000000000000000000000000000 --- a/0001-replace-PTR-with-void.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b5bc8528e76dc281c0b3b2a50502b1145b474631 Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Wed, 11 Oct 2023 17:06:37 +0800 -Subject: [PATCH] replace PTR with void * - ---- - src/ucs/debug/debug.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/ucs/debug/debug.c b/src/ucs/debug/debug.c -index b803636..4bbf509 100644 ---- a/src/ucs/debug/debug.c -+++ b/src/ucs/debug/debug.c -@@ -272,10 +272,10 @@ static int load_file(struct backtrace_file *file) - goto err_close; - } - -- symcount = bfd_read_minisymbols(file->abfd, 0, (PTR)&file->syms, &size); -+ symcount = bfd_read_minisymbols(file->abfd, 0, (void *)&file->syms, &size); - if (symcount == 0) { - free(file->syms); -- symcount = bfd_read_minisymbols(file->abfd, 1, (PTR)&file->syms, &size); -+ symcount = bfd_read_minisymbols(file->abfd, 1, (void *)&file->syms, &size); - } - if (symcount < 0) { - goto err_close; --- -2.40.1 - diff --git a/ucx-1.13.1.tar.gz b/ucx-1.15.0.tar.gz similarity index 30% rename from ucx-1.13.1.tar.gz rename to ucx-1.15.0.tar.gz index ae15758c0784dd62f9e59b05c742340abcb9568f..d0b9adcfd34738ec33a8bd940d49cdbec2055417 100644 Binary files a/ucx-1.13.1.tar.gz and b/ucx-1.15.0.tar.gz differ diff --git a/ucx.spec b/ucx.spec index a4194dfa858685d46ae66089850d8f6f2dbe040e..e27b25d3caf437c65364bae810700c10d66bf60a 100644 --- a/ucx.spec +++ b/ucx.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 1 %{!?configure_options: %global configure_options %{nil}} %bcond_without cma @@ -13,7 +13,7 @@ %bcond_with vfs Name: ucx -Version: 1.13.1 +Version: 1.15.0 Release: %{anolis_release}%{?dist} Summary: UCX is a communication library implementing high-performance messaging @@ -31,7 +31,6 @@ License: BSD-3-Clause AND MIT AND CC-PDDC AND (BSD-3-Clause OR Apache-2.0) URL: http://www.openucx.org Source: https://github.com/openucx/%{name}/releases/download/v%{version}/ucx-%{version}.tar.gz Patch001: 0001-add-loongarch64-support-for-ucx.patch -Patch002: 0001-replace-PTR-with-void.patch %if %{defined extra_deps} Requires: %{?extra_deps} @@ -84,7 +83,6 @@ Provides header files and examples for developing with UCX. %prep %setup -q %patch001 -p1 -%patch002 -p1 %build # Remove these fixes when upgrading to version 1.14 @@ -310,6 +308,9 @@ status, and more. %endif %changelog +* Sat Nov 18 2023 Liwei Ge 1.15.0-1 +- Update to 1.15.0 + * Tue Oct 10 2023 Wenlong Zhang - 1.13.1-2 - add loongarch64 support for ucx