From dbc72d62d31dffb330caac5d5562fd360715ad79 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Thu, 2 Mar 2023 17:56:27 -0700
Subject: [PATCH] Remove dependency libs from wrappers

---
 ...ptimization-and-link-flags-from-pkgc.patch |  2 +-
 ...o-drop-rpath-flags-from-pkgconf-file.patch |  4 +-
 ...-e.g.-specs.-and-lto-from-mpi-wrappe.patch | 74 +++++++++++++------
 3 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/0001-pkgconf-remove-optimization-and-link-flags-from-pkgc.patch b/0001-pkgconf-remove-optimization-and-link-flags-from-pkgc.patch
index 5a9b7b8..2fbee32 100644
--- a/0001-pkgconf-remove-optimization-and-link-flags-from-pkgc.patch
+++ b/0001-pkgconf-remove-optimization-and-link-flags-from-pkgc.patch
@@ -30,7 +30,7 @@ index e905ff2e20..ff6dc35807 100644
  Requires:
 -Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ @WRAPPER_LDFLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_LIBS@
 -Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir}
-+Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_LIBS@
++Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@
 +Cflags: @WRAPPER_CPPFLAGS@ -I${includedir}
  
  # pkg-config does not understand Cxxflags, etc. So we allow users to
diff --git a/0002-pkgconf-also-drop-rpath-flags-from-pkgconf-file.patch b/0002-pkgconf-also-drop-rpath-flags-from-pkgconf-file.patch
index af7828c..46e6c13 100644
--- a/0002-pkgconf-also-drop-rpath-flags-from-pkgconf-file.patch
+++ b/0002-pkgconf-also-drop-rpath-flags-from-pkgconf-file.patch
@@ -18,8 +18,8 @@ index ff6dc35807..5ad7e8bcbc 100644
  Version: @MPICH_VERSION@
  URL: http://www.mcs.anl.gov/research/projects/mpich
  Requires:
--Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_LIBS@
-+Libs: -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_LIBS@
+-Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@
++Libs: -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@
  Cflags: @WRAPPER_CPPFLAGS@ -I${includedir}
  
  # pkg-config does not understand Cxxflags, etc. So we allow users to
diff --git a/0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch b/0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch
index 487f1c5..ad427f7 100644
--- a/0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch
+++ b/0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch
@@ -1,25 +1,25 @@
-From 030214c7084cf5aaf4372147f48343b9915ca743 Mon Sep 17 00:00:00 2001
+From 695102787fde0b3adb3917b12b97f8c49f7f57a5 Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
-Date: Wed, 1 Mar 2023 19:24:41 -0700
+Date: Thu, 2 Mar 2023 17:50:52 -0700
 Subject: [PATCH 3/3] 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/
 ---
- src/env/mpicc.bash.in   | 6 +++---
- src/env/mpicc.sh.in     | 6 +++---
- src/env/mpicxx.bash.in  | 6 +++---
- src/env/mpicxx.sh.in    | 6 +++---
- src/env/mpifort.bash.in | 4 ++--
- src/env/mpifort.sh.in   | 4 ++--
- 6 files changed, 16 insertions(+), 16 deletions(-)
+ src/env/mpicc.bash.in   | 8 ++++----
+ src/env/mpicc.sh.in     | 8 ++++----
+ src/env/mpicxx.bash.in  | 8 ++++----
+ src/env/mpicxx.sh.in    | 8 ++++----
+ src/env/mpifort.bash.in | 6 +++---
+ src/env/mpifort.sh.in   | 6 +++---
+ 6 files changed, 22 insertions(+), 22 deletions(-)
 
 diff --git a/src/env/mpicc.bash.in b/src/env/mpicc.bash.in
-index 3fc695f..f31e436 100644
+index 3fc695f..d8659e5 100644
 --- a/src/env/mpicc.bash.in
 +++ b/src/env/mpicc.bash.in
-@@ -247,9 +247,9 @@ if [ -n "$profConf" ] ; then
+@@ -247,13 +247,13 @@ if [ -n "$profConf" ] ; then
      fi
  fi
  
@@ -32,11 +32,16 @@ index 3fc695f..f31e436 100644
  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_TO_BE_FILLED_AT_INSTALL_TIME__"
++    final_libs="${final_libs}"
+ fi
+ 
+ # -----------------------------------------------------------------------
 diff --git a/src/env/mpicc.sh.in b/src/env/mpicc.sh.in
-index 99a8c90..89ef111 100644
+index 99a8c90..e093907 100644
 --- a/src/env/mpicc.sh.in
 +++ b/src/env/mpicc.sh.in
-@@ -253,9 +253,9 @@ if [ -n "$profConf" ] ; then
+@@ -253,13 +253,13 @@ if [ -n "$profConf" ] ; then
      fi
  fi
  
@@ -49,11 +54,16 @@ index 99a8c90..89ef111 100644
  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_TO_BE_FILLED_AT_INSTALL_TIME__"
++    final_libs="${final_libs}"
+ fi
+ 
+ # -----------------------------------------------------------------------
 diff --git a/src/env/mpicxx.bash.in b/src/env/mpicxx.bash.in
-index 29566ba..f80882e 100644
+index 29566ba..acf897b 100644
 --- a/src/env/mpicxx.bash.in
 +++ b/src/env/mpicxx.bash.in
-@@ -253,9 +253,9 @@ if [ -n "$profConf" ] ; then
+@@ -253,13 +253,13 @@ if [ -n "$profConf" ] ; then
      fi
  fi
  
@@ -66,11 +76,16 @@ index 29566ba..f80882e 100644
  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_TO_BE_FILLED_AT_INSTALL_TIME__"
++    final_libs="${final_libs}"
+ fi
+ 
+ # A temporary statement to invoke the compiler
 diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in
-index 0b830fe..32dab65 100644
+index 0b830fe..36c2486 100644
 --- a/src/env/mpicxx.sh.in
 +++ b/src/env/mpicxx.sh.in
-@@ -259,9 +259,9 @@ if [ -n "$profConf" ] ; then
+@@ -259,13 +259,13 @@ if [ -n "$profConf" ] ; then
      fi
  fi
  
@@ -83,11 +98,16 @@ index 0b830fe..32dab65 100644
  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_TO_BE_FILLED_AT_INSTALL_TIME__"
++    final_libs="${final_libs}"
+ fi
+ 
+ # A temporary statement to invoke the compiler
 diff --git a/src/env/mpifort.bash.in b/src/env/mpifort.bash.in
-index 5312aea..2322b4f 100644
+index 5312aea..c1e557b 100644
 --- a/src/env/mpifort.bash.in
 +++ b/src/env/mpifort.bash.in
-@@ -335,8 +335,8 @@ elif [ -n "$FCMODINC" ] ; then
+@@ -335,12 +335,12 @@ elif [ -n "$FCMODINC" ] ; then
      FCMODDIRS="${FCMODINC}$modincdir"
  fi
  
@@ -98,11 +118,16 @@ index 5312aea..2322b4f 100644
  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_TO_BE_FILLED_AT_INSTALL_TIME__"
++    final_libs="${final_libs}"
+ fi
+ 
+ extra_f77_flags="@WRAPPER_EXTRA_F77_FLAGS@"
 diff --git a/src/env/mpifort.sh.in b/src/env/mpifort.sh.in
-index 902b0f7..665fe85 100644
+index 902b0f7..95c1232 100644
 --- a/src/env/mpifort.sh.in
 +++ b/src/env/mpifort.sh.in
-@@ -352,8 +352,8 @@ elif [ -n "$FCMODINC" ] ; then
+@@ -352,12 +352,12 @@ elif [ -n "$FCMODINC" ] ; then
      FCMODDIRS="${FCMODINC}$modincdir"
  fi
  
@@ -113,6 +138,11 @@ index 902b0f7..665fe85 100644
  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_TO_BE_FILLED_AT_INSTALL_TIME__"
++    final_libs="${final_libs}"
+ fi
+ 
+ extra_f77_flags="@WRAPPER_EXTRA_F77_FLAGS@"
 -- 
-2.39.2
+2.40.0.rc1