From cba731049a24735beb660dc236f61070aa6e387a Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Thu, 5 Jan 2012 22:20:31 -0500 Subject: [PATCH] fix pkg config files Conditionals are not supported. https://trac.mcs.anl.gov/projects/mpich2/ticket/1044 --- configure.in | 6 ++++++ src/packaging/pkgconfig/mpich2-c.pc.in | 8 +------- src/packaging/pkgconfig/mpich2-cxx.pc.in | 8 +------- src/packaging/pkgconfig/mpich2-f77.pc.in | 8 +------- src/packaging/pkgconfig/mpich2-f90.pc.in | 8 +------- 5 files changed, 10 insertions(+), 28 deletions(-) diff --git a/configure.in b/configure.in index 294dc85..44b1010 100644 --- a/configure.in +++ b/configure.in @@ -5332,6 +5332,12 @@ AC_SUBST(MPICH_TIMER_KIND) # Setup other replaceable values AC_SUBST(MPILIBNAME) AC_SUBST(PMPILIBNAME) +PKGCONFIG_PMPILIB="" +if test "$NEEDSPLIB" = yes -a test -n "${PMPILIBNAME}" ; then + PKGCONFIG_PMPILIB="-l${PMPILIBNAME}" +fi +AC_SUBST(PKGCONFIG_PMPILIB) + # Note that aint_size must be used instead of void_p where the desired check # is on the size of MPI_Aint aint_size=$ac_cv_sizeof_void_p diff --git a/src/packaging/pkgconfig/mpich2-c.pc.in b/src/packaging/pkgconfig/mpich2-c.pc.in index 394630b..e0ab3fa 100644 --- a/src/packaging/pkgconfig/mpich2-c.pc.in +++ b/src/packaging/pkgconfig/mpich2-c.pc.in @@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@ 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@ +Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@ Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir} diff --git a/src/packaging/pkgconfig/mpich2-cxx.pc.in b/src/packaging/pkgconfig/mpich2-cxx.pc.in index 936ade6..d82e184 100644 --- a/src/packaging/pkgconfig/mpich2-cxx.pc.in +++ b/src/packaging/pkgconfig/mpich2-cxx.pc.in @@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@ 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@ +Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@ Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir} diff --git a/src/packaging/pkgconfig/mpich2-f77.pc.in b/src/packaging/pkgconfig/mpich2-f77.pc.in index 291462e..193c2ab 100644 --- a/src/packaging/pkgconfig/mpich2-f77.pc.in +++ b/src/packaging/pkgconfig/mpich2-f77.pc.in @@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@ 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@ +Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@ Fflags: @WRAPPER_FFLAGS@ -I${includedir} diff --git a/src/packaging/pkgconfig/mpich2-f90.pc.in b/src/packaging/pkgconfig/mpich2-f90.pc.in index ca15e18..700976f 100644 --- a/src/packaging/pkgconfig/mpich2-f90.pc.in +++ b/src/packaging/pkgconfig/mpich2-f90.pc.in @@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@ 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@ +Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@ Fcflags: @WRAPPER_FCFLAGS@ -I${includedir} -- 1.7.3.4