Skip to content

Commit c22e1ae

Browse files
jsquyresjsquyres
committed
configury: new OPAL_SET_LIB_PREFIX/ORTE_SET_LIB_PREFIX macros
These two macros set the prefix for the OPAL and ORTE libraries, respectively. Specifically, the OPAL library will be named libPREFIXopen-pal.la and the ORTE library will be named libPREFIXopen-rte.la. These macros must be called, even if the prefix argument is empty. The intent is that Open MPI will call these macros with an empty prefix, but other projects (such as ORCM) will call these macros with a non-empty prefix. For example, ORCM libraries can be named liborcm-open-pal.la and liborcm-open-rte.la. This scheme is necessary to allow running Open MPI applications under systems that use their own versions of ORTE and OPAL. For example, when running MPI applications under ORTE, if the ORTE and OPAL libraries between OMPI and ORCM are not identical (which, because they are released at different times, are likely to be different), we need to ensure that the OMPI applications link against their ORTE and OPAL libraries, but the ORCM executables link against their ORTE and OPAL libraries.
1 parent 01fd96b commit c22e1ae

File tree

53 files changed

+203
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+203
-124
lines changed

‎config/opal_set_lib_prefix.m4

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# -*- shell-script -*-
2+
#
3+
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
4+
# $COPYRIGHT$
5+
#
6+
# Additional copyrights may follow
7+
#
8+
# $HEADER$
9+
#
10+
11+
# OPAL_SET_LIB_PREFIX([library_prefix]
12+
#
13+
# This macro sets a prefix for the libopen-pal library. Specifically,
14+
# libopen-pal.la becomes libPREFIXopen-pal.la.
15+
#
16+
# --------------------------------------------------------
17+
AC_DEFUN([OPAL_SET_LIB_PREFIX],[
18+
AS_IF([test "$opal_lib_prefix_set" = "yes"],
19+
[AC_MSG_WARN([OPAL lib prefix was already set!])
20+
AC_MSG_WARN([This is a configury programming error])
21+
AC_MSG_ERROR([Cannot continue])])
22+
23+
OPAL_LIB_PREFIX=$1
24+
opal_lib_prefix_set=yes
25+
AC_SUBST(OPAL_LIB_PREFIX)
26+
])dnl
27+
28+
#
29+
# Same as OPAL LIB_PREFIX, but for the ORTE layer
30+
#
31+
AC_DEFUN([ORTE_SET_LIB_PREFIX],[
32+
AS_IF([test "$orte_lib_prefix_set" = "yes"],
33+
[AC_MSG_WARN([ORTE lib prefix was already set!])
34+
AC_MSG_WARN([This is a configury programming error])
35+
AC_MSG_ERROR([Cannot continue])])
36+
37+
ORTE_LIB_PREFIX=$1
38+
orte_lib_prefix_set=yes
39+
AC_SUBST(ORTE_LIB_PREFIX)
40+
])dnl

‎configure.ac

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1407,13 +1407,15 @@ AC_SUBST(opaldatadir)
14071407
AC_SUBST(opallibdir)
14081408
AC_SUBST(opalincludedir)
14091409
1410+
OPAL_SET_LIB_PREFIX([])
14101411
m4_ifdef([project_orte],
14111412
[ortedatadir="$opaldatadir"
14121413
AC_SUBST(ortedatadir)
14131414
ortelibdir="$opallibdir"
14141415
AC_SUBST(ortelibdir)
14151416
orteincludedir="$opalincludedir"
1416-
AC_SUBST(orteincludedir)])
1417+
AC_SUBST(orteincludedir)
1418+
ORTE_SET_LIB_PREFIX([])])
14171419
m4_ifdef([project_ompi],
14181420
[ompidatadir="$opaldatadir"
14191421
AC_SUBST(ompidatadir)

‎ompi/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
12-
# Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved.
12+
# Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
1414
# Copyright (c) 2010-2011 Sandia National Laboratories. All rights reserved.
1515
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights
@@ -145,10 +145,10 @@ libmpi_la_LIBADD = \
145145

146146
if OMPI_RTE_ORTE
147147
libmpi_la_LIBADD += \
148-
$(OMPI_TOP_BUILDDIR)/orte/libopen-rte.la
148+
$(OMPI_TOP_BUILDDIR)/orte/lib@ORTE_LIB_PREFIX@open-rte.la
149149
endif
150150
libmpi_la_LIBADD += \
151-
$(OMPI_TOP_BUILDDIR)/opal/libopen-pal.la
151+
$(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
152152
libmpi_la_DEPENDENCIES = $(libmpi_la_LIBADD)
153153
libmpi_la_LDFLAGS = \
154154
-version-info $(libmpi_so_version) \

‎ompi/mca/coll/sm/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
12-
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
12+
# Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
1313
# $COPYRIGHT$
1414
#
1515
# Additional copyrights may follow
@@ -62,7 +62,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
6262
mca_coll_sm_la_SOURCES = $(sources)
6363
mca_coll_sm_la_LDFLAGS = -module -avoid-version
6464
mca_coll_sm_la_LIBADD = \
65-
$(OMPI_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la
65+
$(OMPI_TOP_BUILDDIR)/opal/mca/common/sm/lib@OPAL_LIB_PREFIX@mca_common_sm.la
6666

6767
noinst_LTLIBRARIES = $(component_noinst)
6868
libmca_coll_sm_la_SOURCES =$(sources)

‎ompi/mca/pml/ob1/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
1212
# Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
13-
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
13+
# Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
1414
# Copyright (c) 2012 NVIDIA Corporation. All rights reserved.
1515
# $COPYRIGHT$
1616
#
@@ -69,7 +69,7 @@ mca_pml_ob1_la_LDFLAGS = -module -avoid-version
6969

7070
if OPAL_cuda_support
7171
mca_pml_ob1_la_LIBADD = \
72-
$(OMPI_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
72+
$(OMPI_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
7373
endif
7474

7575
noinst_LTLIBRARIES = $(component_noinst)

‎ompi/mca/rte/orte/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#
22
# Copyright (c) 2012 Los Alamos National Security, LLC.
33
# All rights reserved.
4+
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
45
# $COPYRIGHT$
56
#
67
# Additional copyrights may follow
@@ -24,7 +25,7 @@ endif
2425
noinst_LTLIBRARIES = libmca_rte_orte.la
2526
libmca_rte_orte_la_SOURCES =$(sources) $(headers)
2627
libmca_rte_orte_la_LDFLAGS = -module -avoid-version
27-
libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/libopen-rte.la
28+
libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la
2829

2930
man_pages = mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1 ompi-top.1 ompi-server.1
3031

‎ompi/tools/mpisync/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ mpisync_SOURCES = \
7171

7272
mpisync_LDADD = $(top_builddir)/ompi/libmpi.la
7373
if OMPI_RTE_ORTE
74-
mpisync_LDADD += $(top_builddir)/orte/libopen-rte.la
74+
mpisync_LDADD += $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la
7575
endif
76-
mpisync_LDADD += $(top_builddir)/opal/libopen-pal.la
76+
mpisync_LDADD += $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
7777

7878
clean-local:
7979
test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)

‎ompi/tools/ompi_info/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ ompi_info_SOURCES = \
6363

6464
ompi_info_LDADD = $(top_builddir)/ompi/libmpi.la
6565
if OMPI_RTE_ORTE
66-
ompi_info_LDADD += $(top_builddir)/orte/libopen-rte.la
66+
ompi_info_LDADD += $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la
6767
endif
68-
ompi_info_LDADD += $(top_builddir)/opal/libopen-pal.la
68+
ompi_info_LDADD += $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
6969

7070
clean-local:
7171
test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)

‎ompi/tools/wrappers/mpic++-wrapper-data.txt.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
2121
# pulled in implicitly) because we intend MPI applications to only use
2222
# the MPI API.
2323
libs=@OMPI_WRAPPER_CXX_LIB@ -lmpi
24-
libs_static=@OMPI_WRAPPER_CXX_LIB@ -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
24+
libs_static=@OMPI_WRAPPER_CXX_LIB@ -lmpi -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
2525
dyn_lib_file=libmpi.@OPAL_DYN_LIB_SUFFIX@
2626
static_lib_file=libmpi.a
2727
required_file=@OMPI_WRAPPER_CXX_REQUIRED_FILE@

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
2121
# pulled in implicitly) because we intend MPI applications to only use
2222
# the MPI API.
2323
libs=-lmpi
24-
libs_static=-lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
24+
libs_static=-lmpi -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
2525
dyn_lib_file=libmpi.@OPAL_DYN_LIB_SUFFIX@
2626
static_lib_file=libmpi.a
2727
required_file=

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
2020
# pulled in implicitly) because we intend MPI applications to only use
2121
# the MPI API.
2222
libs=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi
23-
libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
23+
libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
2424
dyn_lib_file=libmpi.@OPAL_DYN_LIB_SUFFIX@
2525
static_lib_file=libmpi.a
2626
required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@

‎opal/Makefile.am

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
12-
# Copyright (c) 2009-2011 Cisco Systems, Inc. All rights reserved.
12+
# Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
1313
# $COPYRIGHT$
1414
#
1515
# Additional copyrights may follow
@@ -46,23 +46,23 @@ DIST_SUBDIRS = \
4646

4747
# Build the main OPAL library
4848

49-
lib_LTLIBRARIES = libopen-pal.la
50-
libopen_pal_la_SOURCES =
51-
libopen_pal_la_LIBADD = \
49+
lib_LTLIBRARIES = lib@OPAL_LIB_PREFIX@open-pal.la
50+
lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES =
51+
lib@OPAL_LIB_PREFIX@open_pal_la_LIBADD = \
5252
$(LIBLTDL) \
5353
asm/libasm.la \
5454
datatype/libdatatype.la \
5555
mca/base/libmca_base.la \
5656
util/libopalutil.la \
5757
$(MCA_opal_FRAMEWORK_LIBS)
58-
libopen_pal_la_DEPENDENCIES = $(libopen_pal_la_LIBADD)
59-
libopen_pal_la_LDFLAGS = -version-info $(libopen_pal_so_version)
58+
lib@OPAL_LIB_PREFIX@open_pal_la_DEPENDENCIES = $(lib@OPAL_LIB_PREFIX@open_pal_la_LIBADD)
59+
lib@OPAL_LIB_PREFIX@open_pal_la_LDFLAGS = -version-info $(libopen_pal_so_version)
6060

6161
# included subdirectory Makefile.am's and appended-to variables
6262
headers =
6363
noinst_LTLIBRARIES =
6464
dist_opaldata_DATA =
65-
libopen_pal_la_SOURCES += $(headers)
65+
lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES += $(headers)
6666

6767
# Conditionally install the header files
6868

‎opal/class/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# University of Stuttgart. All rights reserved.
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
13+
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
1314
# $COPYRIGHT$
1415
#
1516
# Additional copyrights may follow
@@ -37,7 +38,7 @@ headers += \
3738
class/opal_rb_tree.h \
3839
class/ompi_free_list.h
3940

40-
libopen_pal_la_SOURCES += \
41+
lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES += \
4142
class/opal_bitmap.c \
4243
class/opal_free_list.c \
4344
class/opal_hash_table.c \

‎opal/dss/Makefile.am

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) 2012 Los Alamos National Security, Inc. All rights reserved.
14+
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
1415
# $COPYRIGHT$
1516
#
1617
# Additional copyrights may follow
@@ -25,7 +26,7 @@ headers += \
2526
dss/dss_types.h \
2627
dss/dss_internal.h
2728

28-
libopen_pal_la_SOURCES += \
29+
lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES += \
2930
dss/dss_internal_functions.c \
3031
dss/dss_compare.c \
3132
dss/dss_copy.c \

‎opal/mca/btl/openib/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
12-
# Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved.
12+
# Copyright (c) 2007-2014 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
1414
# Copyright (c) 2011 NVIDIA Corporation. All rights reserved.
1515
# Copyright (c) 2011 Mellanox Technologies. All rights reserved.
@@ -118,10 +118,10 @@ mcacomponent_LTLIBRARIES = $(component)
118118
mca_btl_openib_la_SOURCES = $(component_sources)
119119
mca_btl_openib_la_LDFLAGS = -module -avoid-version $(btl_openib_LDFLAGS)
120120
mca_btl_openib_la_LIBADD = $(btl_openib_LIBS) \
121-
$(OPAL_TOP_BUILDDIR)/opal/mca/common/verbs/libmca_common_verbs.la
121+
$(OPAL_TOP_BUILDDIR)/opal/mca/common/verbs/lib@OPAL_LIB_PREFIX@mca_common_verbs.la
122122
if OPAL_cuda_support
123123
mca_btl_openib_la_LIBADD += \
124-
$(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
124+
$(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
125125
endif
126126

127127
noinst_LTLIBRARIES = $(lib)

‎opal/mca/btl/sm/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
12-
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
12+
# Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2014 NVIDIA Corporation. All rights reserved.
1414
# $COPYRIGHT$
1515
#
@@ -49,10 +49,10 @@ mcacomponent_LTLIBRARIES = $(component_install)
4949
mca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
5050
mca_btl_sm_la_LDFLAGS = -module -avoid-version
5151
mca_btl_sm_la_LIBADD = \
52-
$(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la
52+
$(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/lib@OPAL_LIB_PREFIX@mca_common_sm.la
5353
if OPAL_cuda_support
5454
mca_btl_sm_la_LIBADD += \
55-
$(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
55+
$(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
5656
endif
5757
mca_btl_sm_la_CPPFLAGS = $(btl_sm_CPPFLAGS)
5858

‎opal/mca/btl/smcuda/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
12-
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
12+
# Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2012 NVIDIA Corporation. All rights reserved.
1414
# $COPYRIGHT$
1515
#
@@ -49,11 +49,11 @@ mcacomponent_LTLIBRARIES = $(component_install)
4949
mca_btl_smcuda_la_SOURCES = $(libmca_btl_smcuda_la_sources)
5050
mca_btl_smcuda_la_LDFLAGS = -module -avoid-version
5151
mca_btl_smcuda_la_LIBADD = \
52-
$(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la
52+
$(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/lib@OPAL_LIB_PREFIX@mca_common_sm.la
5353
mca_btl_smcuda_la_CPPFLAGS = $(btl_smcuda_CPPFLAGS)
5454
if OPAL_cuda_support
5555
mca_btl_smcuda_la_LIBADD += \
56-
$(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
56+
$(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
5757
endif
5858

5959
noinst_LTLIBRARIES = $(component_noinst)

‎opal/mca/btl/tcp/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
12-
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
12+
# Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2013 NVIDIA Corporation. All rights reserved.
1414
# $COPYRIGHT$
1515
#
@@ -57,7 +57,7 @@ mca_btl_tcp_la_SOURCES = $(component_sources)
5757
mca_btl_tcp_la_LDFLAGS = -module -avoid-version
5858
if OPAL_cuda_support
5959
mca_btl_tcp_la_LIBADD = \
60-
$(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
60+
$(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
6161
endif
6262

6363
noinst_LTLIBRARIES = $(lib)

‎opal/mca/btl/usnic/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ mcacomponent_LTLIBRARIES = $(component)
104104
mca_btl_usnic_la_SOURCES = $(component_sources)
105105
mca_btl_usnic_la_LDFLAGS = -module -avoid-version $(btl_usnic_LDFLAGS)
106106
mca_btl_usnic_la_LIBADD = $(btl_usnic_LIBS) \
107-
$(OPAL_TOP_BUILDDIR)/opal/mca/common/verbs/libmca_common_verbs.la
107+
$(OPAL_TOP_BUILDDIR)/opal/mca/common/verbs/lib@OPAL_LIB_PREFIX@mca_common_verbs.la
108108

109109
noinst_LTLIBRARIES = $(lib)
110110
libmca_btl_usnic_la_SOURCES = $(lib_sources)

‎opal/mca/btl/usnic/btl_usnic_proc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ static int create_proc(opal_proc_t *opal_proc,
199199
/* If this proc simply doesn't have this key, then they're not
200200
running the usnic BTL -- just ignore them. Otherwise, show an
201201
error message. */
202-
if (OPAL_ERR_DATA_VALUE_NOT_FOUND == rc) {
202+
if (OPAL_ERR_NOT_FOUND == rc) {
203203
OBJ_RELEASE(proc);
204204
return OPAL_ERR_UNREACH;
205205
} else if (OPAL_SUCCESS != rc) {

‎opal/mca/common/cuda/Makefile.am

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,24 @@ dist_opaldata_DATA = help-mpi-common-cuda.txt
7171

7272
lib_LTLIBRARIES =
7373
noinst_LTLIBRARIES =
74-
comp_inst = libmca_common_cuda.la
75-
comp_noinst = libmca_common_cuda_noinst.la
74+
comp_inst = lib@OPAL_LIB_PREFIX@mca_common_cuda.la
75+
comp_noinst = lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst.la
7676

7777
if MCA_BUILD_opal_common_cuda_DSO
7878
lib_LTLIBRARIES += $(comp_inst)
7979
else
8080
noinst_LTLIBRARIES += $(comp_noinst)
8181
endif
8282

83-
libmca_common_cuda_la_SOURCES = $(headers) $(sources)
84-
libmca_common_cuda_la_LDFLAGS = -version-info $(libmca_common_cuda_so_version)
85-
libmca_common_cuda_la_LIBADD = $(common_cuda_LIBS)
83+
lib@OPAL_LIB_PREFIX@mca_common_cuda_la_SOURCES = $(headers) $(sources)
84+
lib@OPAL_LIB_PREFIX@mca_common_cuda_la_LDFLAGS = \
85+
-version-info $(libmca_common_cuda_so_version)
86+
lib@OPAL_LIB_PREFIX@mca_common_cuda_la_LIBADD = $(common_cuda_LIBS)
8687

87-
libmca_common_cuda_noinst_la_SOURCES = $(libmca_common_cuda_la_SOURCES)
88-
libmca_common_cuda_noinst_la_LDFLAGS = $(common_cuda_LDFLAGS)
89-
libmca_common_cuda_noinst_la_LIBADD = $(common_cuda_LIBS)
88+
lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst_la_SOURCES = \
89+
$(lib@OPAL_LIB_PREFIX@mca_common_cuda_la_SOURCES)
90+
lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst_la_LDFLAGS = $(common_cuda_LDFLAGS)
91+
lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst_la_LIBADD = $(common_cuda_LIBS)
9092

9193
# Conditionally install the header files
9294

0 commit comments

Comments
 (0)