From 6a80338a774c91176f971369168a7bb1936cf68b Mon Sep 17 00:00:00 2001 From: Kamal Heib Date: Tue, 11 Jul 2023 12:56:11 -0400 Subject: [PATCH] Avoid build failure for i386 arch Resolves: rhbz#2220949 Signed-off-by: Kamal Heib --- ...-i686.patch => 0001-Avoid-build-failure-for-i386.patch | 8 ++++---- mpitests.spec | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) rename 0001-Avoid-build-failure-for-i686.patch => 0001-Avoid-build-failure-for-i386.patch (80%) diff --git a/0001-Avoid-build-failure-for-i686.patch b/0001-Avoid-build-failure-for-i386.patch similarity index 80% rename from 0001-Avoid-build-failure-for-i686.patch rename to 0001-Avoid-build-failure-for-i386.patch index e5fb516..3332958 100644 --- a/0001-Avoid-build-failure-for-i686.patch +++ b/0001-Avoid-build-failure-for-i386.patch @@ -1,7 +1,7 @@ -From 37a4deab051d89b95159c4a3559dd084ec7df1c4 Mon Sep 17 00:00:00 2001 +From eeccd454f9dc8b528be706b887f246e82a19d127 Mon Sep 17 00:00:00 2001 From: Kamal Heib Date: Mon, 10 Jul 2023 13:15:27 -0400 -Subject: [PATCH] Avoid build failure for i686 +Subject: [PATCH] Avoid build failure for i386 Signed-off-by: Kamal Heib --- @@ -9,14 +9,14 @@ Signed-off-by: Kamal Heib 1 file changed, 2 insertions(+) diff --git a/c/util/osu_util_validation.c b/c/util/osu_util_validation.c -index c2cd1fa14c1c..f04ed3c1d958 100644 +index c2cd1fa14c1c..b0e1641b1863 100644 --- a/c/util/osu_util_validation.c +++ b/c/util/osu_util_validation.c @@ -299,8 +299,10 @@ static int atom_binary_compare(MPI_Datatype dtype, void *a, void *b) return COMPARE_AS_TYPE(__int32_t, a, b); case 8: return COMPARE_AS_TYPE(__int64_t, a, b); -+#ifndef __i686__ ++#ifndef __i386__ case 16: return COMPARE_AS_TYPE(__int128_t, a, b); +#endif diff --git a/mpitests.spec b/mpitests.spec index 3502d9e..d29f044 100644 --- a/mpitests.spec +++ b/mpitests.spec @@ -3,7 +3,7 @@ Summary: MPI Benchmarks and tests Name: mpitests Version: 7.1 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: CPL and BSD Group: Applications/Engineering # These days we get the benchmark soucres from Intel and OSU directly @@ -14,7 +14,7 @@ Source0: https://github.com/intel/mpi-benchmarks/archive/%{intel_mpi_bench_vers} Source1: http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-%{osu_micro_bench_vers}.tar.gz # Only for old openmpi #Patch101: OMB-disable-collective-async.patch -Patch0001: 0001-Avoid-build-failure-for-i686.patch +Patch0001: 0001-Avoid-build-failure-for-i386.patch BuildRequires: hwloc-devel, libibmad-devel, rdma-core-devel BuildRequires: automake, autoconf, libtool BuildRequires: gcc, gcc-c++ @@ -174,6 +174,10 @@ do_install %endif %changelog +* Tue Jul 11 2023 Kamal Heib - 7.1-2.1 +- Avoid build failure for i386 arch +- Resolves: rhbz#2220949 + * Tue Jul 11 2023 Kamal Heib - 7.1-2 - Avoid build failure for i686 - Resolves: rhbz#2220949