packages/mpich
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!23 Fix build error in openEuler-Mainline

Browse Source 
From: @bzg1107 
Reviewed-by: @ruebb 
Signed-off-by: @ruebb
This commit is contained in:
openeuler-ci-bot 2022-06-20 02:34:29 +00:00 committed by Gitee
commit c1ef045b60
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fix-hwloc-undeclared.patch Normal file
View File

@ -0,0 +1,25 @@
From 8b755526b701806eeb688e1fd139e638602c67b6 Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com>
Date: Fri, 17 Jun 2022 17:36:23 +0800
Subject: [PATCH] fix hwloc undeclared
---
src/pm/hydra/tools/topo/hwloc/topo_hwloc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c b/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c
index 8fff355..d33d15f 100644
--- a/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c
+++ b/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c
@@ -428,7 +428,7 @@ HYD_status HYDT_topo_hwloc_init(const char *binding, const char *mapping, const
HYDT_topo_hwloc_info.membind = HWLOC_MEMBIND_INTERLEAVE;
}
else if (!strncmp(membind, "replicate:", strlen("replicate:"))) {
- HYDT_topo_hwloc_info.membind = HWLOC_MEMBIND_REPLICATE;
+ HYDT_topo_hwloc_info.membind = HWLOC_MEMBIND_MIGRATE;
}
else {
HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
--
2.27.0

6
mpich.spec
View File

@ -1,7 +1,7 @@
Summary: A high-performance implementation of MPI
Name: mpich
Version: 3.2.1
Release: 13
Release: 14
License: MIT
URL: http://www.mpich.org/
Source0: http://www.mpich.org/static/downloads/%{version}/mpich-%{version}.tar.gz
@ -9,6 +9,7 @@ Source1: mpich.macros
Source2: mpich.pth.py3
Patch0: mpich-modules.patch
Patch3: 0003-soften-version-check.patch
Patch4: fix-hwloc-undeclared.patch
BuildRequires: gcc gcc-c++ gcc-gfortran hwloc-devel >= 1.8 valgrind-devel
BuildRequires: python3-devel automake
@ -202,6 +203,9 @@ make check V=1
%{python3_sitearch}/mpich.pth
%changelog
* Fri Jun 17 2022 baizhonggui <baizhonggui@h-partners.com> - 3.2.1-14
- Fix hwloc undeclared
* Mon Aug 02 2021 linjiaxin5 <linjiaxin5@huawei.com> - 3.2.1-13
- Fix failure caused by GCC upgrade to 10