Accepting request 1012029 from home:NMoreyChaisemartin:branches:science:HPC

- Added pc_lookup-replace-PTR-with-void.patch to fix compilation
  on newer glibc.

OBS-URL: https://build.opensuse.org/request/show/1012029
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mpiP?expand=0&rev=38
This commit is contained in:
Egbert Eich 2022-10-17 08:50:51 +00:00 committed by Git OBS Bridge
parent a58e287993
commit 72a12dcf43
3 changed files with 50 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 17 08:09:09 UTC 2022 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
- Added pc_lookup-replace-PTR-with-void.patch to fix compilation
on newer glibc.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 28 11:49:04 UTC 2020 - Egbert Eich <eich@suse.com> Sat Nov 28 11:49:04 UTC 2020 - Egbert Eich <eich@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package mpiP # spec file
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -265,7 +265,7 @@ URL: https://github.com/LLNL/mpiP
Source0: https://github.com/LLNL/mpiP/releases/download/%{version}/mpip-%{version}.tgz#/%{pname}-%{version}.tgz Source0: https://github.com/LLNL/mpiP/releases/download/%{version}/mpip-%{version}.tgz#/%{pname}-%{version}.tgz
Patch1: mpip.unwinder.patch Patch1: mpip.unwinder.patch
Patch2: Add-return-value-to-non-void-function.patch Patch2: Add-return-value-to-non-void-function.patch
Patch3: pc_lookup-replace-PTR-with-void.patch
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
BuildRequires: %{mpi_family}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel BuildRequires: %{mpi_family}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
BuildRequires: binutils-devel BuildRequires: binutils-devel

View File

@ -0,0 +1,41 @@
commit 168e28672992f4c725046b91fda0ffada6ccf842
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
Date: Mon Oct 17 09:59:01 2022 +0200
pc_lookup: replace PTR with void*
PTR is not available in newer glibc versions
Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
diff --git a/pc_lookup.c b/pc_lookup.c
index 4c595645813a..4c2a1a30e693 100644
--- a/pc_lookup.c
+++ b/pc_lookup.c
@@ -115,7 +115,7 @@ static void
find_address_in_section (abfd, section, data)
bfd *abfd;
asection *section;
- PTR data;
+ void* data;
{
bfd_vma vma;
bfd_size_type size;
@@ -435,7 +435,7 @@ mpiP_find_src_loc (void *i_addr_hex, char **o_file_str, int *o_lineno,
found = FALSE;
- bfd_map_over_sections (abfd, find_address_in_section, (PTR) NULL);
+ bfd_map_over_sections (abfd, find_address_in_section, (void*) NULL);
#ifdef SO_LOOKUP
if (!found)
@@ -477,7 +477,7 @@ mpiP_find_src_loc (void *i_addr_hex, char **o_file_str, int *o_lineno,
mpiPi_msg_debug ("fso->bfd->sections is %p\n",
((bfd *) (fso->bfd))->sections);
bfd_map_over_sections (fso->bfd, find_address_in_section,
- (PTR) NULL);
+ (void*) NULL);
}
}