Skip to content

Commit 6b8ad1a

Browse files
jjhurseyjjhursey
committed
build: Custom libmpi_FOO name fix for wrapper compilers
 * In f6f24a4 I missed updating the library references for the wrapper compilers. * Fixes the CXX wrapper compiler and CXX library is renamed as needed. * Fixes the Java wrapper compiler and the Java library is renamed as needed. (cherry picked from commit fc3cf99) Signed-off-by: Joshua Hursey <[email protected]>
1 parent acf0889 commit 6b8ad1a

File tree

9 files changed

+24
-21
lines changed

9 files changed

+24
-21
lines changed

‎config/ompi_setup_mpi_fortran.m4

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ dnl reserved.
1717
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
1818
dnl Copyright (c) 2014-2015 Research Organization for Information Science
1919
dnl and Technology (RIST). All rights reserved.
20+
dnl Copyright (c) 2016 IBM Corporation. All rights reserved.
2021
dnl $COPYRIGHT$
2122
dnl
2223
dnl Additional copyrights may follow
@@ -340,9 +341,9 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[
340341
[OMPI_BUILD_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS
341342
AS_IF([test $OMPI_FORTRAN_HAVE_IGNORE_TKR -eq 1],
342343
[OMPI_FORTRAN_USEMPI_DIR=mpi/fortran/use-mpi-ignore-tkr
343-
OMPI_FORTRAN_USEMPI_LIB=-lmpi_usempi_ignore_tkr],
344+
OMPI_FORTRAN_USEMPI_LIB=-l${with_libmpi_name}_usempi_ignore_tkr],
344345
[OMPI_FORTRAN_USEMPI_DIR=mpi/fortran/use-mpi-tkr
345-
OMPI_FORTRAN_USEMPI_LIB=-lmpi_usempi])
346+
OMPI_FORTRAN_USEMPI_LIB=-l${with_libmpi_name}_usempi])
346347
])
347348

348349
OMPI_FORTRAN_HAVE_ISO_C_BINDING=0
@@ -574,7 +575,7 @@ end type test_mpi_handle],
574575

575576
AC_MSG_CHECKING([if building Fortran 'use mpi_f08' bindings])
576577
AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS],
577-
[OMPI_FORTRAN_USEMPIF08_LIB=-lmpi_usempif08
578+
[OMPI_FORTRAN_USEMPIF08_LIB=-l${with_libmpi_name}_usempif08
578579
AC_MSG_RESULT([yes])],
579580
[OMPI_TRY_FORTRAN_BINDIGS=$OMPI_FORTRAN_USEMPI_BINDINGS
580581
AC_MSG_RESULT([no])])

‎config/opal_setup_wrappers.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dnl Copyright (c) 2006-2010 Oracle and/or its affiliates. All rights reserved.
1414
dnl Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
1515
dnl Copyright (c) 2015 Research Organization for Information Science
1616
dnl and Technology (RIST). All rights reserved.
17+
dnl Copyright (c) 2016 IBM Corporation. All rights reserved.
1718
dnl $COPYRIGHT$
1819
dnl
1920
dnl Additional copyrights may follow
@@ -428,7 +429,7 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
428429
# support. However, we do want it to fail if there is no C++
429430
# compiler.
430431
if test "$WANT_MPI_CXX_SUPPORT" = "1" ; then
431-
OMPI_WRAPPER_CXX_LIB="-lmpi_cxx"
432+
OMPI_WRAPPER_CXX_LIB="-l${with_libmpi_name}_cxx"
432433
OMPI_WRAPPER_CXX_REQUIRED_FILE=""
433434
elif test "$CXX" = "none"; then
434435
OMPI_WRAPPER_CXX_LIB=""

‎contrib/build-mca-comps-outside-of-tree/configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
1313
# Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved.
14+
# Copyright (c) 2016 IBM Corporation. All rights reserved.
1415
# $COPYRIGHT$
1516
#
1617
# Additional copyrights may follow
@@ -154,7 +155,7 @@ EOF
154155
# Open MPI v1.7 libraries
155156
LDFLAGS="$LDFLAGS -L$withval/ompi/.libs"
156157
# For OMPI v1.7 and later
157-
LIBS="$LIBS -lmpi"
158+
LIBS="$LIBS -l@OMPI_LIBMPI_NAME@"
158159

159160
CPPFLAGS="$CPPFLAGS $source_CPPFLAGS"
160161
CFLAGS="$CFLAGS $source_CFLAGS"

‎ompi/mpi/cxx/Makefile.am

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@ AM_CPPFLAGS = -DOMPI_BUILDING_CXX_BINDINGS_LIBRARY=1 -DOMPI_SKIP_MPICXX=1
2828

2929
if BUILD_MPI_CXX_BINDINGS
3030

31-
mpi_lib = libmpi_cxx.la
31+
mpi_lib = lib@OMPI_LIBMPI_NAME@_cxx.la
3232

33-
lib_LTLIBRARIES = libmpi_cxx.la
34-
libmpi_cxx_la_SOURCES = \
33+
lib_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_cxx.la
34+
lib@OMPI_LIBMPI_NAME@_cxx_la_SOURCES = \
3535
mpicxx.cc \
3636
intercepts.cc \
3737
comm.cc \
3838
datatype.cc \
3939
win.cc
4040

4141
if OMPI_PROVIDE_MPI_FILE_INTERFACE
42-
libmpi_cxx_la_SOURCES += \
42+
lib@OMPI_LIBMPI_NAME@_cxx_la_SOURCES += \
4343
file.cc
4444
endif
4545

46-
libmpi_cxx_la_LIBADD = $(top_builddir)/ompi/lib@[email protected]
47-
libmpi_cxx_la_LDFLAGS = -version-info $(libmpi_cxx_so_version)
46+
lib@OMPI_LIBMPI_NAME@_cxx_la_LIBADD = $(top_builddir)/ompi/lib@[email protected]
47+
lib@OMPI_LIBMPI_NAME@_cxx_la_LDFLAGS = -version-info $(libmpi_cxx_so_version)
4848

4949
headers = \
5050
mpicxx.h \

‎ompi/mpi/java/c/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ ompidir = $(ompiincludedir)/ompi/mpi/java
2525
ompi_HEADERS = \
2626
$(headers)
2727

28-
lib_LTLIBRARIES = libmpi_java.la
29-
libmpi_java_la_SOURCES = \
28+
lib_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_java.la
29+
lib@OMPI_LIBMPI_NAME@_java_la_SOURCES = \
3030
mpi_CartComm.c \
3131
mpi_Comm.c \
3232
mpi_Constant.c \
@@ -47,7 +47,7 @@ libmpi_java_la_SOURCES = \
4747
mpi_Status.c \
4848
mpi_Win.c
4949

50-
libmpi_java_la_LIBADD = -ldl $(top_builddir)/ompi/lib@[email protected]
51-
libmpi_java_la_LDFLAGS = -version-info $(libmpi_java_so_version)
50+
lib@OMPI_LIBMPI_NAME@_java_la_LIBADD = -ldl $(top_builddir)/ompi/lib@[email protected]
51+
lib@OMPI_LIBMPI_NAME@_java_la_LDFLAGS = -version-info $(libmpi_java_so_version)
5252

5353
endif

‎ompi/tools/wrappers/mpifort-wrapper-data.txt.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
1919
# intentionally only link in the MPI libraries (ORTE, OPAL, etc. are
2020
# pulled in implicitly) because we intend MPI applications to only use
2121
# the MPI API.
22-
libs=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -l@OMPI_LIBMPI_NAME@
23-
libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -l@OMPI_LIBMPI_NAME@ -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
22+
libs=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@
23+
libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@ -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
2424
dyn_lib_file=lib@OMPI_LIBMPI_NAME@.@OPAL_DYN_LIB_SUFFIX@
2525
static_lib_file=lib@[email protected]
2626
required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@

‎ompi/tools/wrappers/ompi-fort.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ pkgincludedir=@opalincludedir@
1616
# static linking (they're pulled in by libopen-rte.so's implicit
1717
# dependencies), so only list these in Libs.private.
1818
#
19-
Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -l@OMPI_LIBMPI_NAME@
19+
Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@
2020
Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
2121
Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@

‎ompi/tools/wrappers/ompi_wrapper_script.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ elsif (basename($0) eq "mpifort" ||
125125
# no extra includes for Fortran.
126126
$comp_flags = $extra_fcflags;
127127
$comp_flags_prefix = $extra_fcflags_prefix;
128-
$libs = $fortran_libs . " -lmpi_mpifh " . $libs;
128+
$libs = $fortran_libs . " -l".$ompi_libmpi_name."_mpifh " . $libs;
129129
}
130130

131131
if ($lang eq "none") {

‎oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
2929
# intentionally only link in the SHMEM and MPI libraries (ORTE, OPAL,
3030
# etc. are pulled in implicitly) because we intend SHMEM/MPI
3131
# applications to only use the SHMEM and MPI APIs.
32-
libs=-loshmem -lmpi_mpifh -l@OMPI_LIBMPI_NAME@
33-
libs_static=-loshmem -lmpi_mpifh -l@OMPI_LIBMPI_NAME@ -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
32+
libs=-loshmem -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@
33+
libs_static=-loshmem -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@ -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
3434
dyn_lib_file=liboshmem.@OPAL_DYN_LIB_SUFFIX@
3535
static_lib_file=liboshmem.a
3636
required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@

0 commit comments

Comments
 (0)