rpm/libvma
SHA256
1
0
Fork 0
forked from pool/libvma
Code Pull Requests Activity

Accepting request 1198993 from science:HPC

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1198993
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvma?expand=0&rev=18
This commit is contained in:
Ana Guerrero 2024-09-06 15:18:20 +00:00 committed by Git OBS Bridge
commit 5019428eba
4 changed files with 54 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Fix-compilation-with-GCC-14.patch Normal file
View File

@ -0,0 +1,33 @@
commit 09834d6cfa193439f6b35364b4f1c6134643198a
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Sun Jun 23 12:09:14 2024 -0400
Fix compilation with GCC 14
C++20 has changed the syntax for nested template constructors:
```
In file included from ../../src/vma/proto/mem_buf_desc.h:39,
from ../../src/vma/util/utils.h:47,
from vlogger.cpp:46:
../../src/vma/util/vma_list.h:210:31: error: template-id not allowed for constructor in C++20 [-Werror=template-id-cdtor]
210 | vma_list_t<T, offset> (const vma_list_t<T, offset>& other) {
| ^
../../src/vma/util/vma_list.h:210:31: note: remove the '< >'
```
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
diff --git src/vma/util/vma_list.h src/vma/util/vma_list.h
index cd3e5f9eef38..550fe709ea05 100644
--- src/vma/util/vma_list.h
+++ src/vma/util/vma_list.h
@@ -207,7 +207,7 @@ public:
}
}
- vma_list_t<T, offset> (const vma_list_t<T, offset>& other) {
+ vma_list_t(const vma_list_t<T, offset>& other) {
if (!other.empty())
vlist_logwarn("Copy constructor is not supported for non-empty list! other.size=%zu", other.m_size);
init_list();

14
harden_vma.service.patch
View File

@ -1,7 +1,13 @@
Index: libvma-9.3.1.0.47396f1a5eaa/contrib/scripts/vma.service.in
===================================================================
--- libvma-9.3.1.0.47396f1a5eaa.orig/contrib/scripts/vma.service.in
+++ libvma-9.3.1.0.47396f1a5eaa/contrib/scripts/vma.service.in
commit efdb35ba76077c15054efa3c170c13ce303f284d
Author: Nicolas Morey <nmorey@suse.com>
Date: Thu Sep 5 14:40:33 2024 +0200
harden vma.service
diff --git contrib/scripts/vma.service.in contrib/scripts/vma.service.in
index e6f5a25b7e00..86d40487ab24 100644
--- contrib/scripts/vma.service.in
+++ contrib/scripts/vma.service.in
@@ -3,6 +3,19 @@ Description=VMA Daemon
After=network.target

7
libvma.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 5 12:43:04 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
- Backport upstream patch to fix compilation GCC >= 14
- Fix-compilation-with-GCC-14.patch
- Refresh harden_vma.service.patch to use patch -p0 format
-------------------------------------------------------------------
Fri Mar 1 10:22:45 UTC 2024 - pgajdos@suse.com

7
libvma.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libvma
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,7 +28,8 @@ Version: 9.8.40
Release: 0
Source0: %{name}-%{version}%{git_ver}.tar.gz
Source1: vma.service
Patch3: harden_vma.service.patch
Patch1: harden_vma.service.patch
Patch2: Fix-compilation-with-GCC-14.patch
URL: https://github.com/Mellanox/libvma
BuildRequires: autoconf
BuildRequires: automake
@ -70,7 +71,7 @@ Requires: libvma%{lib_major} = %{version}
Headers and symbolink link required to compile and link with the Libvma library.
%prep
%autosetup -p1 -n %{name}-%{version}%{git_ver}
%autosetup -p0 -n %{name}-%{version}%{git_ver}
%build
./autogen.sh