Skip to content

Commit 913bc8f

Browse files
jjhurseyjjhursey
committed
mca: Dynamic components link against project lib
 * Resolves #3705 * Components should link against the project level library to better support `dlopen` with `RTLD_LOCAL`. * Extend the `mca_FRAMEWORK_COMPONENT_la_LIBADD` in the `Makefile.am` with the appropriate project level library: ``` MCA components in ompi/ $(top_builddir)/ompi/lib@[email protected] MCA components in orte/ $(top_builddir)/orte/lib@[email protected] MCA components in opal/ $(top_builddir)/opal/lib@[email protected] MCA components in oshmem/ $(top_builddir)/oshmem/liboshmem.la" ``` Note: The changes in this commit were automated by the script in the commit that proceeds it with the `libadd_mca_comp_update.py` script. Some components were not included in this change because they are statically built only. Signed-off-by: Joshua Hursey <[email protected]> Local application of the LIBADD script: `./contrib/libadd_mca_comp_update.py` Reference `master` commit e1d0795
1 parent 499d8e6 commit 913bc8f

File tree

184 files changed

+248
-72
lines changed

Some content is hidden

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

184 files changed

+248
-72
lines changed

‎ompi/mca/bml/r2/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ mcacomponentdir = $(ompilibdir)
3737
mcacomponent_LTLIBRARIES = $(component_install)
3838
mca_bml_r2_la_SOURCES = $(r2_sources)
3939
mca_bml_r2_la_LDFLAGS = -module -avoid-version
40+
mca_bml_r2_la_LIBADD = $(top_builddir)/ompi/lib@[email protected]
4041

4142
noinst_LTLIBRARIES = $(component_noinst)
4243
libmca_bml_r2_la_SOURCES = $(r2_sources)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ mcacomponentdir = $(ompilibdir)
6363
mcacomponent_LTLIBRARIES = $(component_install)
6464
mca_coll_basic_la_SOURCES = $(sources)
6565
mca_coll_basic_la_LDFLAGS = -module -avoid-version
66+
mca_coll_basic_la_LIBADD = $(top_builddir)/ompi/lib@[email protected]
6667

6768
noinst_LTLIBRARIES = $(component_noinst)
6869
libmca_coll_basic_la_SOURCES =$(sources)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ mcacomponentdir = $(ompilibdir)
3131
mcacomponent_LTLIBRARIES = $(component_install)
3232
mca_coll_cuda_la_SOURCES = $(sources)
3333
mca_coll_cuda_la_LDFLAGS = -module -avoid-version
34+
mca_coll_cuda_la_LIBADD = $(top_builddir)/ompi/lib@[email protected]
3435

3536
noinst_LTLIBRARIES = $(component_noinst)
3637
libmca_coll_cuda_la_SOURCES =$(sources)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ mcacomponentdir = $(ompilibdir)
5656
mcacomponent_LTLIBRARIES = $(component_install)
5757
mca_coll_demo_la_SOURCES = $(sources)
5858
mca_coll_demo_la_LDFLAGS = -module -avoid-version
59+
mca_coll_demo_la_LIBADD = $(top_builddir)/ompi/lib@[email protected]
5960

6061
noinst_LTLIBRARIES = $(component_noinst)
6162
libmca_coll_demo_la_SOURCES = $(sources)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ endif
3737
mcacomponentdir = $(ompilibdir)
3838
mcacomponent_LTLIBRARIES = $(component_install)
3939
mca_coll_fca_la_SOURCES = $(coll_fca_sources)
40-
mca_coll_fca_la_LIBADD = $(coll_fca_LIBS)
40+
mca_coll_fca_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
41+
$(coll_fca_LIBS)
4142
mca_coll_fca_la_LDFLAGS = -module -avoid-version $(coll_fca_LDFLAGS)
4243

4344
noinst_LTLIBRARIES = $(component_noinst)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ endif
3838
mcacomponentdir = $(ompilibdir)
3939
mcacomponent_LTLIBRARIES = $(component_install)
4040
mca_coll_hcoll_la_SOURCES = $(coll_hcoll_sources)
41-
mca_coll_hcoll_la_LIBADD = $(coll_hcoll_LIBS)
41+
mca_coll_hcoll_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
42+
$(coll_hcoll_LIBS)
4243
mca_coll_hcoll_la_LDFLAGS = -module -avoid-version $(coll_hcoll_LDFLAGS)
4344

4445
noinst_LTLIBRARIES = $(component_noinst)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ mcacomponentdir = $(ompilibdir)
3232
mcacomponent_LTLIBRARIES = $(component_install)
3333
mca_coll_inter_la_SOURCES = $(sources)
3434
mca_coll_inter_la_LDFLAGS = -module -avoid-version
35+
mca_coll_inter_la_LIBADD = $(top_builddir)/ompi/lib@[email protected]
3536

3637
noinst_LTLIBRARIES = $(component_noinst)
3738
libmca_coll_inter_la_SOURCES = $(sources)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ mcacomponentdir = $(ompilibdir)
7070
mcacomponent_LTLIBRARIES = $(component_install)
7171
mca_coll_libnbc_la_SOURCES = $(sources)
7272
mca_coll_libnbc_la_LDFLAGS = -module -avoid-version
73+
mca_coll_libnbc_la_LIBADD = $(top_builddir)/ompi/lib@[email protected]
7374

7475
noinst_LTLIBRARIES = $(component_noinst)
7576
libmca_coll_libnbc_la_SOURCES =$(sources)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ AM_CPPFLAGS = $(coll_portals4_CPPFLAGS)
3232
mcacomponentdir = $(ompilibdir)
3333
mcacomponent_LTLIBRARIES = $(component_install)
3434
mca_coll_portals4_la_SOURCES = $(local_sources)
35-
mca_coll_portals4_la_LIBADD = $(coll_portals4_LIBS)
35+
mca_coll_portals4_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
36+
$(coll_portals4_LIBS)
3637
mca_coll_portals4_la_LDFLAGS = -module -avoid-version $(coll_portals4_LDFLAGS)
3738

3839
noinst_LTLIBRARIES = $(component_noinst)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ mcacomponentdir = $(ompilibdir)
5454
mcacomponent_LTLIBRARIES = $(component_install)
5555
mca_coll_self_la_SOURCES = $(sources)
5656
mca_coll_self_la_LDFLAGS = -module -avoid-version
57+
mca_coll_self_la_LIBADD = $(top_builddir)/ompi/lib@[email protected]
5758

5859
noinst_LTLIBRARIES = $(component_noinst)
5960
libmca_coll_self_la_SOURCES =$(sources)

0 commit comments

Comments
 (0)