projects / packages / mpich.git / blame
| Commit | Line | Data |
|---|---|---|
| dc8c0b94 JB |
1 | --- mpich-3.1.3/configure.ac.orig 2014-11-22 21:36:39.473469954 +0100 |
| 2 | +++ mpich-3.1.3/configure.ac 2014-11-22 22:20:53.770025233 +0100 | |
| 3 | @@ -1212,6 +1212,8 @@ | |
| 4 | AC_SUBST([opasrcdir]) | |
| 5 | opalibdir="" | |
| 6 | AC_SUBST([opalibdir]) | |
| 7 | +opalibopt="" | |
| 8 | +AC_SUBST([opalibopt]) | |
| 9 | opalib="" | |
| 10 | AC_SUBST([opalib]) | |
| 11 | ||
| 12 | @@ -1219,6 +1221,7 @@ | |
| 13 | if test -e "${use_top_srcdir}/src/openpa" ; then | |
| 14 | opasrcdir="${master_top_builddir}/src/openpa" | |
| 15 | opalibdir="${master_top_builddir}/src/openpa/src" | |
| 16 | + opalibopt="-L${master_top_builddir}/src/openpa/src" | |
| 17 | opalib="${master_top_builddir}/src/openpa/src/lib${OPALIBNAME}.la" | |
| 18 | PAC_APPEND_FLAG([-I${use_top_srcdir}/src/openpa/src],[CPPFLAGS]) | |
| 19 | PAC_APPEND_FLAG([-I${master_top_builddir}/src/openpa/src],[CPPFLAGS]) | |
| 20 | @@ -1255,8 +1258,10 @@ | |
| 21 | if test -d ${with_openpa_prefix}/lib64 ; then | |
| 22 | PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib64],[WRAPPER_LDFLAGS]) | |
| 23 | opalibdir="${with_openpa_prefix}/lib64" | |
| 24 | + opalibopt="-L${with_openpa_prefix}/lib64" | |
| 25 | else | |
| 26 | opalibdir="${with_openpa_prefix}/lib" | |
| 27 | + opalibopt="-L${with_openpa_prefix}/lib" | |
| 28 | fi | |
| 29 | PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib],[WRAPPER_LDFLAGS]) | |
| 30 | fi | |
| 31 | --- mpich-3.1.3/Makefile.am.orig 2014-10-07 23:50:23.000000000 +0200 | |
| 32 | +++ mpich-3.1.3/Makefile.am 2014-11-22 22:21:28.990023755 +0100 | |
| 33 | @@ -48,7 +48,7 @@ | |
| 34 | errnames_txt_files = | |
| 35 | ||
| 36 | external_subdirs = @mplsrcdir@ @opasrcdir@ | |
| 37 | -external_ldflags = -L@mpllibdir@ -L@opalibdir@ | |
| 38 | +external_ldflags = -L@mpllibdir@ @opalibopt@ | |
| 39 | external_libs = @EXTERNAL_LIBS@ | |
| 40 | mpi_convenience_libs = | |
| 41 | pmpi_convenience_libs = @mpllib@ @opalib@ | |
| 42 | --- mpich-3.1.3/examples/Makefile.am.orig 2014-10-07 23:50:23.000000000 +0200 | |
| 43 | +++ mpich-3.1.3/examples/Makefile.am 2014-11-22 23:06:01.823244920 +0100 | |
| 44 | @@ -36,7 +36,7 @@ | |
| 45 | # the make-time instances of libpmpi.la and libmpi.la live here | |
| 46 | AM_LDFLAGS += -L../lib | |
| 47 | # the make-time instances of libmpl.la and libopa.la live here | |
| 48 | -AM_LDFLAGS += -L@mpllibdir@ -L@opalibdir@ | |
| 49 | +AM_LDFLAGS += -L@mpllibdir@ @opalibopt@ | |
| 50 | ||
| 51 | # Wrapper LDFLAGS need to be added at the end to make sure we link | |
| 52 | # with the libraries we just built, and not any previously installed |