rpms / mpich

Clone
Source Code
GIT

#4 Drop build flag from mpi wrappers
Merged 3 years ago by zbyszek. Opened 3 years ago by junghans.
rpms/ junghans/mpich master  into  master

file added
+160 
@@ -0,0 +1,160 @@ 
 

+ diff -Naur mpich-3.3.2.orig/src/env/mpicc.bash.in mpich-3.3.2/src/env/mpicc.bash.in
 

+ --- mpich-3.3.2.orig/src/env/mpicc.bash.in	2020-08-06 00:42:51.089874000 +0000
 

+ +++ mpich-3.3.2/src/env/mpicc.bash.in	2020-08-06 00:49:34.849138000 +0000
 

+ @@ -214,13 +214,13 @@
 

+      fi
 

+  fi
 

+  

+ -final_cflags="@MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@"
 

+ -final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
 

+ -final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@"
 

+ +final_cflags="@MPICH_MPICC_CFLAGS@ "
 

+ +final_cppflags="@MPICH_MPICC_CPPFLAGS@ "
 

+ +final_ldflags="@MPICH_MPICC_LDFLAGS@ "
 

+  final_libs="@MPICH_MPICC_LIBS@"
 

+  if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
 

+      final_ldflags="${final_ldflags} @LDFLAGS@"
 

+ -    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 

+ +    final_libs="${final_libs} @LIBS@ "
 

+  fi
 

+  

+  # -----------------------------------------------------------------------
 

+ diff -Naur mpich-3.3.2.orig/src/env/mpicc.sh.in mpich-3.3.2/src/env/mpicc.sh.in
 

+ --- mpich-3.3.2.orig/src/env/mpicc.sh.in	2020-08-06 00:42:51.090874000 +0000
 

+ +++ mpich-3.3.2/src/env/mpicc.sh.in	2020-08-06 00:49:34.849138000 +0000
 

+ @@ -223,13 +223,13 @@
 

+      fi
 

+  fi
 

+  

+ -final_cflags="@MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@"
 

+ -final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
 

+ -final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@"
 

+ +final_cflags="@MPICH_MPICC_CFLAGS@ "
 

+ +final_cppflags="@MPICH_MPICC_CPPFLAGS@ "
 

+ +final_ldflags="@MPICH_MPICC_LDFLAGS@ "
 

+  final_libs="@MPICH_MPICC_LIBS@"
 

+  if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
 

+      final_ldflags="${final_ldflags} @LDFLAGS@"
 

+ -    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 

+ +    final_libs="${final_libs} @LIBS@ "
 

+  fi
 

+  

+  # -----------------------------------------------------------------------
 

+ diff -Naur mpich-3.3.2.orig/src/env/mpicxx.bash.in mpich-3.3.2/src/env/mpicxx.bash.in
 

+ --- mpich-3.3.2.orig/src/env/mpicxx.bash.in	2020-08-06 00:42:51.090874000 +0000
 

+ +++ mpich-3.3.2/src/env/mpicxx.bash.in	2020-08-06 00:49:34.849138000 +0000
 

+ @@ -220,13 +220,13 @@
 

+      fi
 

+  fi
 

+  

+ -final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@"
 

+ -final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
 

+ -final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@"
 

+ +final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ "
 

+ +final_cppflags="@MPICH_MPICXX_CPPFLAGS@ "
 

+ +final_ldflags="@MPICH_MPICXX_LDFLAGS@ "
 

+  final_libs="@MPICH_MPICXX_LIBS@"
 

+  if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
 

+      final_ldflags="${final_ldflags} @LDFLAGS@"
 

+ -    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 

+ +    final_libs="${final_libs} @LIBS@ "
 

+  fi
 

+  

+  # A temporary statement to invoke the compiler
 

+ diff -Naur mpich-3.3.2.orig/src/env/mpicxx.sh.in mpich-3.3.2/src/env/mpicxx.sh.in
 

+ --- mpich-3.3.2.orig/src/env/mpicxx.sh.in	2020-08-06 00:42:51.090874000 +0000
 

+ +++ mpich-3.3.2/src/env/mpicxx.sh.in	2020-08-06 00:49:34.850138000 +0000
 

+ @@ -229,13 +229,13 @@
 

+      fi
 

+  fi
 

+  

+ -final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@"
 

+ -final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
 

+ -final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@"
 

+ +final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ "
 

+ +final_cppflags="@MPICH_MPICXX_CPPFLAGS@ "
 

+ +final_ldflags="@MPICH_MPICXX_LDFLAGS@ "
 

+  final_libs="@MPICH_MPICXX_LIBS@"
 

+  if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
 

+      final_ldflags="${final_ldflags} @LDFLAGS@"
 

+ -    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 

+ +    final_libs="${final_libs} @LIBS@ "
 

+  fi
 

+  

+  # A temporary statement to invoke the compiler
 

+ diff -Naur mpich-3.3.2.orig/src/env/mpif77.bash.in mpich-3.3.2/src/env/mpif77.bash.in
 

+ --- mpich-3.3.2.orig/src/env/mpif77.bash.in	2020-08-06 00:42:51.090874000 +0000
 

+ +++ mpich-3.3.2/src/env/mpif77.bash.in	2020-08-06 00:49:34.852138000 +0000
 

+ @@ -272,12 +272,12 @@
 

+      fi
 

+  fi
 

+  

+ -final_fflags="@MPICH_MPIF77_FFLAGS@ @WRAPPER_FFLAGS@"
 

+ -final_ldflags="@MPICH_MPIF77_LDFLAGS@ @WRAPPER_LDFLAGS@"
 

+ +final_fflags="@MPICH_MPIF77_FFLAGS@ "
 

+ +final_ldflags="@MPICH_MPIF77_LDFLAGS@ "
 

+  final_libs="@MPICH_MPIF77_LIBS@"
 

+  if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
 

+      final_ldflags="${final_ldflags} @LDFLAGS@"
 

+ -    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 

+ +    final_libs="${final_libs} @LIBS@ "
 

+  fi
 

+  

+  # A temporary statement to invoke the compiler
 

+ diff -Naur mpich-3.3.2.orig/src/env/mpif77.sh.in mpich-3.3.2/src/env/mpif77.sh.in
 

+ --- mpich-3.3.2.orig/src/env/mpif77.sh.in	2020-08-06 00:42:51.090874000 +0000
 

+ +++ mpich-3.3.2/src/env/mpif77.sh.in	2020-08-06 00:49:34.852138000 +0000
 

+ @@ -294,12 +294,12 @@
 

+      fi
 

+  fi
 

+  

+ -final_fflags="@MPICH_MPIF77_FFLAGS@ @WRAPPER_FFLAGS@"
 

+ -final_ldflags="@MPICH_MPIF77_LDFLAGS@ @WRAPPER_LDFLAGS@"
 

+ +final_fflags="@MPICH_MPIF77_FFLAGS@ "
 

+ +final_ldflags="@MPICH_MPIF77_LDFLAGS@ "
 

+  final_libs="@MPICH_MPIF77_LIBS@"
 

+  if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
 

+      final_ldflags="${final_ldflags} @LDFLAGS@"
 

+ -    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 

+ +    final_libs="${final_libs} @LIBS@ "
 

+  fi
 

+  

+  # A temporary statement to invoke the compiler
 

+ diff -Naur mpich-3.3.2.orig/src/env/mpifort.bash.in mpich-3.3.2/src/env/mpifort.bash.in
 

+ --- mpich-3.3.2.orig/src/env/mpifort.bash.in	2020-08-06 00:42:51.090874000 +0000
 

+ +++ mpich-3.3.2/src/env/mpifort.bash.in	2020-08-06 00:49:34.854138000 +0000
 

+ @@ -313,12 +313,12 @@
 

+      FCMODDIRS="${FCMODINC}$modincdir"
 

+  fi
 

+  

+ -final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@"
 

+ -final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@"
 

+ +final_fcflags="@MPICH_MPIFORT_FCFLAGS@ "
 

+ +final_ldflags="@MPICH_MPIFORT_LDFLAGS@ "
 

+  final_libs="@MPICH_MPIFORT_LIBS@"
 

+  if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
 

+      final_ldflags="${final_ldflags} @LDFLAGS@"
 

+ -    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 

+ +    final_libs="${final_libs} @LIBS@ "
 

+  fi
 

+  

+  # A temporary statement to invoke the compiler
 

+ diff -Naur mpich-3.3.2.orig/src/env/mpifort.sh.in mpich-3.3.2/src/env/mpifort.sh.in
 

+ --- mpich-3.3.2.orig/src/env/mpifort.sh.in	2020-08-06 00:42:51.090874000 +0000
 

+ +++ mpich-3.3.2/src/env/mpifort.sh.in	2020-08-06 00:49:34.854138000 +0000
 

+ @@ -330,12 +330,12 @@
 

+      FCMODDIRS="${FCMODINC}$modincdir"
 

+  fi
 

+  

+ -final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@"
 

+ -final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@"
 

+ +final_fcflags="@MPICH_MPIFORT_FCFLAGS@ "
 

+ +final_ldflags="@MPICH_MPIFORT_LDFLAGS@ "
 

+  final_libs="@MPICH_MPIFORT_LIBS@"
 

+  if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
 

+      final_ldflags="${final_ldflags} @LDFLAGS@"
 

+ -    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 

+ +    final_libs="${final_libs} @LIBS@ "
 

+  fi
 

+  

+  # A temporary statement to invoke the compiler

file modified
+9 -1 
@@ -1,7 +1,7 @@ 
 

  Summary:        A high-performance implementation of MPI
 

  Name:           mpich
 

  Version:        3.3.2
 

- Release:        6%{?dist}
 

+ Release:        7%{?dist}
 

  License:        MIT
 

  URL:            https://www.mpich.org/
 

  
@@ -13,6 +13,10 @@ 
 

  Patch1:         0001-Drop-real128.patch
 

  # fix for #1793563 and #1799473
 

  Patch2:         https://github.com/pmodels/mpich/pull/4320.patch
 

+ # Drop build flags, e.g. -specs... and -lto from mpi wrappers (mpicc and mpicxx)
 

+ # for discussion see:
 

+ # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/7TFWEKTDWBYBHEGMIWBVI3AVGORZGNBS/
 

+ Patch3:         fix_wrapper_flags.patch
 

  

  BuildRequires:  gcc
 

  BuildRequires:  gcc-c++
 
@@ -106,6 +110,7 @@ 
 

  %patch1 -p1
 

  %endif
 

  %patch2 -p1
 

+ %patch3 -p1
 

  

  %build
 

  CONFIGURE_OPTS=(
 
@@ -229,6 +234,9 @@ 
 

  %{python3_sitearch}/%{name}.pth
 

  

  %changelog
 

+ * Thu Aug 06 2020 Christoph Junghans <junghans@votca.org> - 3.3.2-7
 

+ - Drop build flag from mpi wrappers
 

+ 

  * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-6
 

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

no initial comment

Thanks for working on this. Looks reasonable. But please add a some comment why this is needed (a link to the thread on fedora-devel would be nice). Without context it might not be clear a few years down the road.

rebased onto c40fc55
3 years ago

@zbyszek done.

Pull-Request has been merged by zbyszek
3 years ago
Changes Summary 2
+160
file added
fix_wrapper_flags.patch
+9 -1
file changed
mpich.spec
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.