From e1d9972fccac2c6283c31095d5b9db264144c281 Mon Sep 17 00:00:00 2001 From: wang_yue111 <648774160@qq.com> Date: Tue, 10 Aug 2021 10:36:49 +0800 Subject: [PATCH] fix build error with glibc-2.34 --- fix-build-error-with-glibc-2.34.patch | 27 +++++++++++++++++++++++++++ libvma.spec | 7 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 fix-build-error-with-glibc-2.34.patch diff --git a/fix-build-error-with-glibc-2.34.patch b/fix-build-error-with-glibc-2.34.patch new file mode 100644 index 0000000..5643f40 --- /dev/null +++ b/fix-build-error-with-glibc-2.34.patch @@ -0,0 +1,27 @@ +From 8796b971e58bf7c224cae800209c5eaa53cf9841 Mon Sep 17 00:00:00 2001 +From: Igor Ivanov +Date: Thu, 17 Jun 2021 16:07:31 +0300 +Subject: [PATCH] issue: 2485156 Fix fc35 issues + +- glibc: + The function pthread_yield has been deprecated; programs should use + the equivalent standard function sched_yield instead. + +Signed-off-by: Igor Ivanov +--- + src/vma/iomux/epfd_info.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/vma/iomux/epfd_info.cpp b/src/vma/iomux/epfd_info.cpp +index c7670c7b3..d7c6c4fcd 100644 +--- a/src/vma/iomux/epfd_info.cpp ++++ b/src/vma/iomux/epfd_info.cpp +@@ -624,7 +624,7 @@ int epfd_info::ring_poll_and_process_element(uint64_t *p_poll_sn, void* pv_fd_re + + m_ring_map_lock.unlock(); + +- if (m_sysvar_thread_mode == THREAD_MODE_PLENTY && ret_total == 0 && errno == EAGAIN) pthread_yield(); ++ if (m_sysvar_thread_mode == THREAD_MODE_PLENTY && ret_total == 0 && errno == EAGAIN) sched_yield(); + + if (ret_total) { + __log_func("ret_total=%d", ret_total); diff --git a/libvma.spec b/libvma.spec index af6c4a1..b37282d 100644 --- a/libvma.spec +++ b/libvma.spec @@ -1,12 +1,14 @@ Name: libvma Version: 8.9.4 -Release: 11 +Release: 12 Summary: A library that boosts performance for message-based and streaming applications License: GPLv2 or BSD URL: https://github.com/Mellanox/libvma Source: https://github.com/Mellanox/libvma/archive/%{version}.tar.gz Patch0000: Resolve-gcc-9.x-issues.patch Patch0001: 0001-Remove-ExecReload-that-is-not-supported.patch +Patch0002: fix-build-error-with-glibc-2.34.patch + ExcludeArch: %{arm} Requires: pam Requires(post): /sbin/ldconfig @@ -69,6 +71,9 @@ Headers files for libvma. %{_pkgdocdir}/VMA_VERSION %changelog +* Tue Aug 10 2021 wangyue - 8.9.4-12 +- fix build error with glibc-2.34 + * Tue Jun 08 2021 wulei - 8.9.4-11 - fixes failed: g++: No such file or directory -- Gitee