Attachment 610602 Details for Bug 830165 – Patch that should correct mpich pkgconfig files

[patch] Patch that should correct mpich pkgconfig files

mpich2-pkgconfig-fixup.patch (text/plain), 7.53 KB, created by Brian Lloyd on 2012-09-07 04:03:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Lloyd

Created: 2012-09-07 04:03:56 UTC

Size: 7.53 KB

patch

obsolete

>diff -cr mpich2-1.4.1p1/configure.in mpich2/configure.in
>*** mpich2-1.4.1p1/configure.in	2011-08-15 18:27:55.000000000 -0500
>--- mpich2/configure.in	2012-09-06 22:39:08.218522633 -0500
>***************
>*** 2728,2736 ****
>  # ----------------------------------------------------------------------------
>  # At this point, we've finally settled on the value of PMPILIBNAME.  We
>  # can now set NEEDSPLIB.
>! if test "$NEEDSPLIB" = yes -a "$PMPILIBNAME" = "$MPILIBNAME" ; then
>      NEEDSPLIB=no
>  fi
>  # Set the defaults for the Fortran libraries to be the same as the C libraries
>  if test -z "$MPIFLIBNAME" ; then 
>      MPIFLIBNAME=$MPILIBNAME 
>--- 2728,2739 ----
>  # ----------------------------------------------------------------------------
>  # At this point, we've finally settled on the value of PMPILIBNAME.  We
>  # can now set NEEDSPLIB.
>! LPMPILIBNAME=-l$PMPILIBNAME
>! if test x"$PMPILIBNAME" = x"$MPILIBNAME" ; then
>      NEEDSPLIB=no
>+     LPMPILIBNAME=
>  fi
>+ ACSUBST(LPMPILIBNAME)
>  # Set the defaults for the Fortran libraries to be the same as the C libraries
>  if test -z "$MPIFLIBNAME" ; then 
>      MPIFLIBNAME=$MPILIBNAME 
>diff -cr mpich2-1.4.1p1/src/packaging/pkgconfig/mpich2-c.pc.in mpich2/src/packaging/pkgconfig/mpich2-c.pc.in
>*** mpich2-1.4.1p1/src/packaging/pkgconfig/mpich2-c.pc.in	2011-06-16 19:14:59.000000000 -0500
>--- mpich2/src/packaging/pkgconfig/mpich2-c.pc.in	2012-09-06 22:40:08.510919816 -0500
>***************
>*** 4,18 ****
>  libdir=@libdir@
>  includedir=@includedir@
>  
>! if test "@NEEDSPLIB@" = "yes" ; then
>!    plib=@PMPILIBNAME@
>! else
>!    plib=
>! fi
>  
>  Name: mpich2
>  Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
>  Version: @MPICH2_VERSION@
>  Requires:
>! Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
>  Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir}
>--- 4,14 ----
>  libdir=@libdir@
>  includedir=@includedir@
>  
>! plib=@LPMPILIBNAME@
>  
>  Name: mpich2
>  Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
>  Version: @MPICH2_VERSION@
>  Requires:
>! Libs: @WRAPPER_LDFLAGS@ -L${libdir} ${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
>  Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir}
>Only in mpich2/src/packaging/pkgconfig: .mpich2-c.pc.in.swp
>diff -cr mpich2-1.4.1p1/src/packaging/pkgconfig/mpich2-cxx.pc.in mpich2/src/packaging/pkgconfig/mpich2-cxx.pc.in
>*** mpich2-1.4.1p1/src/packaging/pkgconfig/mpich2-cxx.pc.in	2011-06-16 19:14:59.000000000 -0500
>--- mpich2/src/packaging/pkgconfig/mpich2-cxx.pc.in	2012-09-06 22:40:21.619223586 -0500
>***************
>*** 4,18 ****
>  libdir=@libdir@
>  includedir=@includedir@
>  
>! if test "@NEEDSPLIB@" = "yes" ; then
>!    plib=@PMPILIBNAME@
>! else
>!    plib=
>! fi
>  
>  Name: mpich2
>  Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
>  Version: @MPICH2_VERSION@
>  Requires:
>! Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
>  Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir}
>--- 4,14 ----
>  libdir=@libdir@
>  includedir=@includedir@
>  
>! plib=@LPMPILIBNAME@
>  
>  Name: mpich2
>  Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
>  Version: @MPICH2_VERSION@
>  Requires:
>! Libs: @WRAPPER_LDFLAGS@ -L${libdir} ${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
>  Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir}
>diff -cr mpich2-1.4.1p1/src/packaging/pkgconfig/mpich2-f77.pc.in mpich2/src/packaging/pkgconfig/mpich2-f77.pc.in
>*** mpich2-1.4.1p1/src/packaging/pkgconfig/mpich2-f77.pc.in	2011-06-16 19:14:59.000000000 -0500
>--- mpich2/src/packaging/pkgconfig/mpich2-f77.pc.in	2012-09-06 22:40:37.316587406 -0500
>***************
>*** 4,18 ****
>  libdir=@libdir@
>  includedir=@includedir@
>  
>! if test "@NEEDSPLIB@" = "yes" ; then
>!    plib=@PMPILIBNAME@
>! else
>!    plib=
>! fi
>  
>  Name: mpich2
>  Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
>  Version: @MPICH2_VERSION@
>  Requires:
>! Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
>  Fflags: @WRAPPER_FFLAGS@ -I${includedir}
>--- 4,14 ----
>  libdir=@libdir@
>  includedir=@includedir@
>  
>! plib=@LPMPILIBNAME@
>  
>  Name: mpich2
>  Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
>  Version: @MPICH2_VERSION@
>  Requires:
>! Libs: @WRAPPER_LDFLAGS@ -L${libdir} ${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
>  Fflags: @WRAPPER_FFLAGS@ -I${includedir}
>diff -cr mpich2-1.4.1p1/src/packaging/pkgconfig/mpich2-f90.pc.in mpich2/src/packaging/pkgconfig/mpich2-f90.pc.in
>*** mpich2-1.4.1p1/src/packaging/pkgconfig/mpich2-f90.pc.in	2011-06-16 19:14:59.000000000 -0500
>--- mpich2/src/packaging/pkgconfig/mpich2-f90.pc.in	2012-09-06 22:40:51.516916415 -0500
>***************
>*** 4,18 ****
>  libdir=@libdir@
>  includedir=@includedir@
>  
>! if test "@NEEDSPLIB@" = "yes" ; then
>!    plib=@PMPILIBNAME@
>! else
>!    plib=
>! fi
>  
>  Name: mpich2
>  Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
>  Version: @MPICH2_VERSION@
>  Requires:
>! Libs: @WRAPPER_LDFLAGS@ -L${libdir} -l${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
>  Fcflags: @WRAPPER_FCFLAGS@ -I${includedir}
>--- 4,14 ----
>  libdir=@libdir@
>  includedir=@includedir@
>  
>! plib=@LPMPILIBNAME@
>  
>  Name: mpich2
>  Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
>  Version: @MPICH2_VERSION@
>  Requires:
>! Libs: @WRAPPER_LDFLAGS@ -L${libdir} ${plib} -l@MPILIBNAME@ @WRAPPER_LIBS@
>  Fcflags: @WRAPPER_FCFLAGS@ -I${includedir}

Actions: View | Diff

Attachments on bug 830165: 610602