commit 00238d6be3ea74c52e716a4c280847e19af63d46
Author: Jakub Bogusz <[email protected]>
Date: Thu Nov 19 21:52:36 2020 +0100
- updated to 3.1.4
- removed outdated opalink patch
- filled -devel dependencies
mpich-opalink.patch | 52 ----------------------------------------------------
mpich.spec | 18 ++++++++++--------
2 files changed, 10 insertions(+), 60 deletions(-)
---
diff --git a/mpich.spec b/mpich.spec
index 633e19b..c2f0467 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -1,3 +1,4 @@
+# TODO: separate fortran lib/tools? c++ too?
#
# Conditional build:
%bcond_with blcr # blcr application checkpointing support (no support
for recent kernels)
@@ -5,16 +6,15 @@
Summary: Portable MPI Model Implementation
Summary(pl.UTF-8): Przenośna implementacja standardu MPI
Name: mpich
-Version: 3.1.3
-Release: 3
+Version: 3.1.4
+Release: 1
License: BSD-like
Group: Development/Libraries
-Source0:
http://www.mpich.org/static/downloads/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 93cb17f91ac758cbf9174ecb03563778
+Source0:
https://www.mpich.org/static/downloads/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 2ab544607986486562e076b83937bba2
Patch0: %{name}-sh.patch
-Patch1: %{name}-opalink.patch
-Patch2: x32-misdetected-as-i386.patch
-URL: http://www.mpich.org/
+Patch1: x32-misdetected-as-i386.patch
+URL: https://www.mpich.org/
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.12.3
%{?with_blcr:BuildRequires: blcr-devel}
@@ -53,6 +53,9 @@ Summary: MPICH header files and development tools
Summary(pl.UTF-8): Pliki nagłówkowe oraz narzędzia programistyczne MPICH
Group: Development
Requires: %{name} = %{version}-%{release}
+Requires: gcc-fortran
+Requires: libstdc++-devel
+Requires: openpa-devel
Provides: mpi-devel
%description devel
@@ -78,7 +81,6 @@ Biblioteki statyczne MPICH.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
diff --git a/mpich-opalink.patch b/mpich-opalink.patch
deleted file mode 100644
index ee5a567..0000000
--- a/mpich-opalink.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- mpich-3.1.3/configure.ac.orig 2014-11-22 21:36:39.473469954 +0100
-+++ mpich-3.1.3/configure.ac 2014-11-22 22:20:53.770025233 +0100
-@@ -1212,6 +1212,8 @@
- AC_SUBST([opasrcdir])
- opalibdir=""
- AC_SUBST([opalibdir])
-+opalibopt=""
-+AC_SUBST([opalibopt])
- opalib=""
- AC_SUBST([opalib])
-
-@@ -1219,6 +1221,7 @@
- if test -e "${use_top_srcdir}/src/openpa" ; then
- opasrcdir="${master_top_builddir}/src/openpa"
- opalibdir="${master_top_builddir}/src/openpa/src"
-+ opalibopt="-L${master_top_builddir}/src/openpa/src"
- opalib="${master_top_builddir}/src/openpa/src/lib${OPALIBNAME}.la"
- PAC_APPEND_FLAG([-I${use_top_srcdir}/src/openpa/src],[CPPFLAGS])
- PAC_APPEND_FLAG([-I${master_top_builddir}/src/openpa/src],[CPPFLAGS])
-@@ -1255,8 +1258,10 @@
- if test -d ${with_openpa_prefix}/lib64 ; then
- PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib64],[WRAPPER_LDFLAGS])
- opalibdir="${with_openpa_prefix}/lib64"
-+ opalibopt="-L${with_openpa_prefix}/lib64"
- else
- opalibdir="${with_openpa_prefix}/lib"
-+ opalibopt="-L${with_openpa_prefix}/lib"
- fi
- PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib],[WRAPPER_LDFLAGS])
- fi
---- mpich-3.1.3/Makefile.am.orig 2014-10-07 23:50:23.000000000 +0200
-+++ mpich-3.1.3/Makefile.am 2014-11-22 22:21:28.990023755 +0100
-@@ -48,7 +48,7 @@
- errnames_txt_files =
-
- external_subdirs = @mplsrcdir@ @opasrcdir@
--external_ldflags = -L@mpllibdir@ -L@opalibdir@
-+external_ldflags = -L@mpllibdir@ @opalibopt@
- external_libs = @EXTERNAL_LIBS@
- mpi_convenience_libs =
- pmpi_convenience_libs = @mpllib@ @opalib@
---- mpich-3.1.3/examples/Makefile.am.orig 2014-10-07 23:50:23.000000000
+0200
-+++ mpich-3.1.3/examples/Makefile.am 2014-11-22 23:06:01.823244920 +0100
-@@ -36,7 +36,7 @@
- # the make-time instances of libpmpi.la and libmpi.la live here
- AM_LDFLAGS += -L../lib
- # the make-time instances of libmpl.la and libopa.la live here
--AM_LDFLAGS += -L@mpllibdir@ -L@opalibdir@
-+AM_LDFLAGS += -L@mpllibdir@ @opalibopt@
-
- # Wrapper LDFLAGS need to be added at the end to make sure we link
- # with the libraries we just built, and not any previously installed
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mpich.git/commitdiff/00238d6be3ea74c52e716a4c280847e19af63d46
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
