diff --git a/sys-cluster/openmpi/openmpi-3.1.1.recipe b/sys-cluster/openmpi/openmpi-3.1.2.recipe similarity index 96% rename from sys-cluster/openmpi/openmpi-3.1.1.recipe rename to sys-cluster/openmpi/openmpi-3.1.2.recipe index a486e4e96..87381fd44 100644 --- a/sys-cluster/openmpi/openmpi-3.1.1.recipe +++ b/sys-cluster/openmpi/openmpi-3.1.2.recipe @@ -48,7 +48,7 @@ COPYRIGHT="2004-2010 The Trustees of Indiana University and Indiana \ LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="https://download.open-mpi.org/release/open-mpi/v3.1/openmpi-$portVersion.tar.bz2" -CHECKSUM_SHA256="3f11b648dd18a8b878d057e9777f2c43bf78297751ad77ae2cef6db0fe80c77c" +CHECKSUM_SHA256="c654ed847f34a278c52a15c98add40402b4a90f0c540779f1ae6c489af8a76c5" PATCHES="openmpi-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -69,13 +69,13 @@ openmpiLibs=" libmca_common_monitoringVersion=50.0.0 libmca_common_ompioVersion=41.9.0 libmca_common_smVersion=40.10.0 -libmpi_mpifhVersion=40.10.1 +libmpi_mpifhVersion=40.11.2 libmpi_usempi_ignore_tkrVersion=40.10.1 libmpi_usempif08Version=40.10.1 -libmpiVersion=40.10.1 +libmpiVersion=40.10.2 libompitraceVersion=40.10.0 -libopen_palVersion=40.10.1 -libopen_rteVersion=40.10.1 +libopen_palVersion=40.10.2 +libopen_rteVersion=40.10.2 for i in $openmpiLibs; do eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\"" done @@ -131,6 +131,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libexecinfo$secondaryArchSuffix lib:libevent_2.1$secondaryArchSuffix lib:libevent_pthreads$secondaryArchSuffix lib:libgfortran$secondaryArchSuffix @@ -167,10 +168,11 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:awk + cmd:bison cmd:flex cmd:gfortran$secondaryArchSuffix cmd:g++$secondaryArchSuffix -# cmd:libtoolize$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:perl cmd:pkg_config$secondaryArchSuffix @@ -221,6 +223,5 @@ INSTALL() TEST() { - # Still broken LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/ompi/.libs:$sourceDir/opal/.libs:$sourceDir/orte/.libs make check } diff --git a/sys-cluster/openmpi/patches/openmpi-3.1.1.patchset b/sys-cluster/openmpi/patches/openmpi-3.1.2.patchset similarity index 59% rename from sys-cluster/openmpi/patches/openmpi-3.1.1.patchset rename to sys-cluster/openmpi/patches/openmpi-3.1.2.patchset index e189ea27c..528f1e442 100644 --- a/sys-cluster/openmpi/patches/openmpi-3.1.1.patchset +++ b/sys-cluster/openmpi/patches/openmpi-3.1.2.patchset @@ -1,4 +1,4 @@ -From de46e41334a6cbdb98db7caaa580439b5b16be2f Mon Sep 17 00:00:00 2001 +From 89a9383bcffd979ab9f21c1f8bc553cd4f1574df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Mon, 6 Aug 2018 12:09:32 +0200 Subject: Build fix @@ -26,7 +26,7 @@ index e9d8cdb..afb791e 100644 2.16.4 -From 2a7e669e6ef22af5a9cd3630831f320a750a1d87 Mon Sep 17 00:00:00 2001 +From dba6b864266345b2f63b93e27d0194a4c3566d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Mon, 6 Aug 2018 12:29:26 +0200 Subject: Test fix @@ -47,3 +47,27 @@ index 266a1c2..978ca75 100644 -- 2.16.4 + +From b81ac9aa68e035bcd7fe3c807e7673e2c147c0f3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Thu, 23 Aug 2018 22:14:41 +0200 +Subject: Haiku got no sys/mount.h + + +diff --git a/test/util/opal_path_nfs.c b/test/util/opal_path_nfs.c +index b5fad7a..40d0dab 100644 +--- a/test/util/opal_path_nfs.c ++++ b/test/util/opal_path_nfs.c +@@ -31,7 +31,9 @@ + #include + + #include ++#ifndef __HAIKU__ + #include ++#endif + #ifdef HAVE_SYS_STATFS_H + #include + #endif +-- +2.16.4 +