control: tags -1 patch pending
Hello Alastair, please take this patch and commit on git. I couldn't do it
because the latest changes were not pushed
diff -Nru ucx-1.18.1+ds/debian/changelog ucx-1.18.1+ds/debian/changelog
--- ucx-1.18.1+ds/debian/changelog 2025-03-04 13:40:04.000000000 +0100
+++ ucx-1.18.1+ds/debian/changelog 2025-03-11 14:17:30.000000000 +0100
@@ -1,3 +1,11 @@
+ucx (1.18.1+ds-2) unstable; urgency=medium
+
+ * Team Upload
+ [ Dandan Zhang <zhangdan...@loongson.cn> ]
+ * Update loongarch64 patch for new release (Closes: #1099636)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Tue, 11 Mar 2025
14:17:30 +0100
+
ucx (1.18.1+ds-1) unstable; urgency=medium
* New upstream release
diff -Nru ucx-1.18.1+ds/debian/patches/ucx-add-loongarch64-support.patch
ucx-1.18.1+ds/debian/patches/ucx-add-loongarch64-support.patch
--- ucx-1.18.1+ds/debian/patches/ucx-add-loongarch64-support.patch
2025-03-04 13:40:04.000000000 +0100
+++ ucx-1.18.1+ds/debian/patches/ucx-add-loongarch64-support.patch
2025-03-11 14:15:59.000000000 +0100
@@ -438,7 +438,7 @@
===================================================================
--- /dev/null
+++ ucx-1.18.0+ds~rc3/src/ucs/arch/loongarch64/cpu.h
-@@ -0,0 +1,113 @@
+@@ -0,0 +1,115 @@
+/**
+* Copyright (C) Tactical Computing Labs, LLC. 2022. ALL RIGHTS RESERVED.
+* Copyright (C) Rivos Inc. 2023
@@ -537,7 +537,9 @@
+}
+#endif
+
-+static inline void *ucs_memcpy_relaxed(void *dst, const void *src, size_t len)
++static inline void *ucs_memcpy_relaxed(void *dst, const void *src, size_t len,
++ ucs_arch_memcpy_hint_t hint,
++ size_t total_len)
+{
+ return memcpy(dst, src, len);
+}
On Thu, 6 Mar 2025 11:45:47 +0800 zhangdandan <zhangdan...@loongson.cn> wrote:
Source: ucx
Version: 1.18.1+ds-1
Severity: normal
Tags: FTBFS patch
User: debian-loonga...@lists.debian.org
Usertags: loong64
Dear maintainers,
Compiling the ucx failed for loong64 in the Debian Package Auto-Building
environment.
The error log is as follows,
```
......
sys/iovec.c: In function 'ucs_iov_copy':
sys/iovec.c:47:13: error: too many arguments to function
'ucs_memcpy_relaxed'
47 | ucs_memcpy_relaxed(iov_buf,
UCS_PTR_BYTE_OFFSET(buf, copied), len,
| ^~~~~~~~~~~~~~~~~~
.......
```
The full build log can be found at
https://buildd.debian.org/status/fetch.php?pkg=ucx&arch=loong64&ver=1.18.1%2Bds-1&stamp=1741101442&raw=0.
Please consider the patch I attached.
According to the function calling in ./src/ucs/sys/iovec.c file, I need
to update the parameters of function ucs_memcpy_relaxed();.
Based on attached patch, I have built ucx (1.18.1+ds-1+loong64)
successfully on locally.
```
......
dpkg-deb --root-owner-group --build
debian/.debhelper/libucx0/dbgsym-root ..
dpkg-deb: building package 'libucx-dev' in
'../libucx-dev_1.18.1+ds-1+loong64_loong64.deb'.
dpkg-deb: building package 'ucx-utils-dbgsym' in
'../ucx-utils-dbgsym_1.18.1+ds-1+loong64_loong64.deb'.
dpkg-deb: building package 'libucx0' in
'../libucx0_1.18.1+ds-1+loong64_loong64.deb'.
dpkg-deb: building package 'ucx-utils' in
'../ucx-utils_1.18.1+ds-1+loong64_loong64.deb'.
dpkg-deb: building package 'libucx0-dbgsym' in
'../libucx0-dbgsym_1.18.1+ds-1+loong64_loong64.deb'.
dpkg-genbuildinfo -O../ucx_1.18.1+ds-1+loong64_loong64.buildinfo
dpkg-genchanges -O../ucx_1.18.1+ds-1+loong64_loong64.changes
```
Your opinions are welcome.
Best regards,
Dandan Zhang
