| 1 |
jsbronder 12/01/12 02:11:52 |
| 2 |
|
| 3 |
Added: mpich2-1.4_rc2-fix-pkg-config-files.patch |
| 4 |
Log: |
| 5 |
rename patch prior to version bump |
| 6 |
|
| 7 |
(Portage version: 2.1.10.11/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-cluster/mpich2/files/mpich2-1.4_rc2-fix-pkg-config-files.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.4_rc2-fix-pkg-config-files.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.4_rc2-fix-pkg-config-files.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mpich2-1.4_rc2-fix-pkg-config-files.patch |
| 16 |
=================================================================== |
| 17 |
From e4ffe1eb191ab5d02de5c25e416f1d4d0f471f44 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Justin Bronder <jsbronder@×××××.com> |
| 19 |
Date: Sun, 12 Jun 2011 14:45:34 -0400 |
| 20 |
Subject: [PATCH] fix pkg-config files |
| 21 |
|
| 22 |
https://trac.mcs.anl.gov/projects/mpich2/ticket/1044 |
| 23 |
https://trac.mcs.anl.gov/projects/mpich2/ticket/1500 |
| 24 |
--- |
| 25 |
configure.in | 6 ++++++ |
| 26 |
src/packaging/pkgconfig/mpich2-c.pc.in | 10 ++-------- |
| 27 |
src/packaging/pkgconfig/mpich2-cxx.pc.in | 10 ++-------- |
| 28 |
src/packaging/pkgconfig/mpich2-f77.pc.in | 10 ++-------- |
| 29 |
src/packaging/pkgconfig/mpich2-f90.pc.in | 10 ++-------- |
| 30 |
5 files changed, 14 insertions(+), 32 deletions(-) |
| 31 |
|
| 32 |
diff --git a/configure.in b/configure.in |
| 33 |
index de22cac..8543bb1 100644 |
| 34 |
--- a/configure.in |
| 35 |
+++ b/configure.in |
| 36 |
@@ -5329,6 +5329,12 @@ AC_SUBST(MPICH_TIMER_KIND) |
| 37 |
# Setup other replaceable values |
| 38 |
AC_SUBST(MPILIBNAME) |
| 39 |
AC_SUBST(PMPILIBNAME) |
| 40 |
+PKGCONFIG_PMPILIB="" |
| 41 |
+if test "$NEEDSPLIB" = yes -a test -n "${PMPILIBNAME}" ; then |
| 42 |
+ PKGCONFIG_PMPILIB="-l${PMPILIBNAME}" |
| 43 |
+fi |
| 44 |
+AC_SUBST(PKGCONFIG_PMPILIB) |
| 45 |
+ |
| 46 |
# Note that aint_size must be used instead of void_p where the desired check |
| 47 |
# is on the size of MPI_Aint |
| 48 |
aint_size=$ac_cv_sizeof_void_p |
| 49 |
diff --git a/src/packaging/pkgconfig/mpich2-c.pc.in b/src/packaging/pkgconfig/mpich2-c.pc.in |
| 50 |
index b071fc6..e0ab3fa 100644 |
| 51 |
--- a/src/packaging/pkgconfig/mpich2-c.pc.in |
| 52 |
+++ b/src/packaging/pkgconfig/mpich2-c.pc.in |
| 53 |
@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@ |
| 54 |
libdir=@libdir@ |
| 55 |
includedir=@includedir@ |
| 56 |
|
| 57 |
-if test "@NEEDSPLIB@" = "yes" ; then |
| 58 |
- plib=@PMPILIBNAME@ |
| 59 |
-else |
| 60 |
- plib= |
| 61 |
-fi |
| 62 |
- |
| 63 |
Name: mpich2 |
| 64 |
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. |
| 65 |
Version: @MPICH2_VERSION@ |
| 66 |
Requires: |
| 67 |
-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 68 |
-Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I$includedir |
| 69 |
+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 70 |
+Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir} |
| 71 |
diff --git a/src/packaging/pkgconfig/mpich2-cxx.pc.in b/src/packaging/pkgconfig/mpich2-cxx.pc.in |
| 72 |
index d21f9e6..d82e184 100644 |
| 73 |
--- a/src/packaging/pkgconfig/mpich2-cxx.pc.in |
| 74 |
+++ b/src/packaging/pkgconfig/mpich2-cxx.pc.in |
| 75 |
@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@ |
| 76 |
libdir=@libdir@ |
| 77 |
includedir=@includedir@ |
| 78 |
|
| 79 |
-if test "@NEEDSPLIB@" = "yes" ; then |
| 80 |
- plib=@PMPILIBNAME@ |
| 81 |
-else |
| 82 |
- plib= |
| 83 |
-fi |
| 84 |
- |
| 85 |
Name: mpich2 |
| 86 |
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. |
| 87 |
Version: @MPICH2_VERSION@ |
| 88 |
Requires: |
| 89 |
-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 90 |
-Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I$includedir |
| 91 |
+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 92 |
+Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir} |
| 93 |
diff --git a/src/packaging/pkgconfig/mpich2-f77.pc.in b/src/packaging/pkgconfig/mpich2-f77.pc.in |
| 94 |
index 1b48bf6..193c2ab 100644 |
| 95 |
--- a/src/packaging/pkgconfig/mpich2-f77.pc.in |
| 96 |
+++ b/src/packaging/pkgconfig/mpich2-f77.pc.in |
| 97 |
@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@ |
| 98 |
libdir=@libdir@ |
| 99 |
includedir=@includedir@ |
| 100 |
|
| 101 |
-if test "@NEEDSPLIB@" = "yes" ; then |
| 102 |
- plib=@PMPILIBNAME@ |
| 103 |
-else |
| 104 |
- plib= |
| 105 |
-fi |
| 106 |
- |
| 107 |
Name: mpich2 |
| 108 |
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. |
| 109 |
Version: @MPICH2_VERSION@ |
| 110 |
Requires: |
| 111 |
-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 112 |
-Fflags: @WRAPPER_FFLAGS@ -I$includedir |
| 113 |
+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 114 |
+Fflags: @WRAPPER_FFLAGS@ -I${includedir} |
| 115 |
diff --git a/src/packaging/pkgconfig/mpich2-f90.pc.in b/src/packaging/pkgconfig/mpich2-f90.pc.in |
| 116 |
index ebb8499..700976f 100644 |
| 117 |
--- a/src/packaging/pkgconfig/mpich2-f90.pc.in |
| 118 |
+++ b/src/packaging/pkgconfig/mpich2-f90.pc.in |
| 119 |
@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@ |
| 120 |
libdir=@libdir@ |
| 121 |
includedir=@includedir@ |
| 122 |
|
| 123 |
-if test "@NEEDSPLIB@" = "yes" ; then |
| 124 |
- plib=@PMPILIBNAME@ |
| 125 |
-else |
| 126 |
- plib= |
| 127 |
-fi |
| 128 |
- |
| 129 |
Name: mpich2 |
| 130 |
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. |
| 131 |
Version: @MPICH2_VERSION@ |
| 132 |
Requires: |
| 133 |
-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 134 |
-Fcflags: @WRAPPER_FCFLAGS@ -I$includedir |
| 135 |
+Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@ |
| 136 |
+Fcflags: @WRAPPER_FCFLAGS@ -I${includedir} |
| 137 |
-- |
| 138 |
1.7.3.4 |
Archives