Skip to content

Commit 5793e19

Browse files
committed
Makefile.am's: if calling OPAL functions, must link to it
On some OSs (e.g., Ubuntu 14.04.2 LTS), the linker is configured such that the symbols of library dependencies are not available to the application. Hence, we need to explicitly list such dependencies when creating the executable. For this commit, these tests are use OPAL function calls, so we must explicitly link in libopen-pal.so. (cherry picked from commit open-mpi/ompi@42b9a96)
1 parent 6025150 commit 5793e19

File tree

3 files changed

+37
-20
lines changed

3 files changed

+37
-20
lines changed

ompi/debuggers/Makefile.am

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ headers = \
4343
# Simple checks to ensure that the DSOs are functional
4444

4545
dlopen_test_SOURCES = dlopen_test.c
46-
dlopen_test_LDADD = $(top_builddir)/ompi/libmpi.la
46+
dlopen_test_LDADD = \
47+
$(top_builddir)/ompi/libmpi.la \
48+
$(top_builddir)/opal/lib@[email protected]
4749
dlopen_test_DEPENDENCIES = $(ompi_predefined_LDADD)
4850

4951
predefined_gap_test_SOURCES = predefined_gap_test.c

test/class/Makefile.am

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +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) 2010-2014 Cisco Systems, Inc. All rights reserved.
13+
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
1414
# Copyright (c) 2014 Research Organization for Information Science
1515
# and Technology (RIST). All rights reserved.
1616
# $COPYRIGHT$
@@ -41,61 +41,62 @@ TESTS = $(check_PROGRAMS)
4141

4242
opal_bitmap_SOURCES = opal_bitmap.c
4343
opal_bitmap_LDADD = \
44-
$(top_builddir)/opal/libopen-pal.la \
44+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
4545
$(top_builddir)/test/support/libsupport.a
4646
opal_bitmap_DEPENDENCIES = $(opal_bitmap_LDADD)
4747

4848
opal_list_SOURCES = opal_list.c
4949
opal_list_LDADD = \
50-
$(top_builddir)/opal/libopen-pal.la \
50+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
5151
$(top_builddir)/test/support/libsupport.a
5252
opal_list_DEPENDENCIES = $(opal_list_LDADD)
5353

5454
opal_tree_SOURCES = opal_tree.c
5555
opal_tree_LDADD = \
56-
$(top_builddir)/opal/libopen-pal.la \
56+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
5757
$(top_builddir)/test/support/libsupport.a
5858
opal_tree_DEPENDENCIES = $(opal_tree_LDADD)
5959

6060
opal_hash_table_SOURCES = opal_hash_table.c
6161
opal_hash_table_LDADD = \
62-
$(top_builddir)/opal/libopen-pal.la \
62+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
6363
$(top_builddir)/test/support/libsupport.a
6464
opal_hash_table_DEPENDENCIES = $(opal_hash_table_LDADD)
6565

6666
opal_proc_table_SOURCES = opal_proc_table.c
6767
opal_proc_table_LDADD = \
68-
$(top_builddir)/opal/libopen-pal.la \
68+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
6969
$(top_builddir)/test/support/libsupport.a
7070
opal_proc_table_DEPENDENCIES = $(opal_proc_table_LDADD)
7171

7272
opal_pointer_array_SOURCES = opal_pointer_array.c
7373
opal_pointer_array_LDADD = \
74-
$(top_builddir)/opal/libopen-pal.la \
74+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
7575
$(top_builddir)/test/support/libsupport.a
7676
opal_pointer_array_DEPENDENCIES = $(opal_pointer_array_LDADD)
7777

7878
opal_value_array_SOURCES = opal_value_array.c
7979
opal_value_array_LDADD = \
80-
$(top_builddir)/opal/libopen-pal.la \
80+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
8181
$(top_builddir)/test/support/libsupport.a
8282
opal_value_array_DEPENDENCIES = $(opal_value_array_LDADD)
8383

8484
ompi_rb_tree_SOURCES = ompi_rb_tree.c
8585
ompi_rb_tree_LDADD = \
8686
$(top_builddir)/ompi/libmpi.la \
87+
$(top_builddir)/opal/lib@[email protected] \
8788
$(top_builddir)/test/support/libsupport.a
8889
ompi_rb_tree_DEPENDENCIES = $(ompi_rb_tree_LDADD)
8990

9091
opal_lifo_SOURCES = opal_lifo.c
9192
opal_lifo_LDADD = \
92-
$(top_builddir)/opal/libopen-pal.la \
93+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
9394
$(top_builddir)/test/support/libsupport.a
9495
opal_lifo_DEPENDENCIES = $(opal_lifo_LDADD)
9596

9697
opal_fifo_SOURCES = opal_fifo.c
9798
opal_fifo_LDADD = \
98-
$(top_builddir)/opal/libopen-pal.la \
99+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
99100
$(top_builddir)/test/support/libsupport.a
100101
opal_fifo_DEPENDENCIES = $(opal_fifo_LDADD)
101102

test/datatype/Makefile.am

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,51 @@ check_PROGRAMS = $(TESTS) $(MPI_CHECKS)
2323

2424
unpack_ooo_SOURCES = unpack_ooo.c ddt_lib.c ddt_lib.h
2525
unpack_ooo_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
26-
unpack_ooo_LDADD = $(top_builddir)/ompi/libmpi.la
26+
unpack_ooo_LDADD = \
27+
$(top_builddir)/ompi/libmpi.la \
28+
$(top_builddir)/opal/lib@[email protected]
2729

2830
ddt_test_SOURCES = ddt_test.c ddt_lib.c ddt_lib.h
2931
ddt_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
30-
ddt_test_LDADD = $(top_builddir)/ompi/libmpi.la
32+
ddt_test_LDADD = \
33+
$(top_builddir)/ompi/libmpi.la \
34+
$(top_builddir)/opal/lib@[email protected]
3135

3236
ddt_raw_SOURCES = ddt_raw.c ddt_lib.c ddt_lib.h
3337
ddt_raw_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
34-
ddt_raw_LDADD = $(top_builddir)/ompi/libmpi.la
38+
ddt_raw_LDADD = \
39+
$(top_builddir)/ompi/libmpi.la \
40+
$(top_builddir)/opal/lib@[email protected]
3541

3642
ddt_pack_SOURCES = ddt_pack.c
3743
ddt_pack_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
38-
ddt_pack_LDADD = $(top_builddir)/ompi/libmpi.la
44+
ddt_pack_LDADD = \
45+
$(top_builddir)/ompi/libmpi.la \
46+
$(top_builddir)/opal/lib@[email protected]
3947

4048
checksum_SOURCES = checksum.c
4149
checksum_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
42-
checksum_LDADD = $(top_builddir)/ompi/libmpi.la
50+
checksum_LDADD = \
51+
$(top_builddir)/ompi/libmpi.la \
52+
$(top_builddir)/opal/lib@[email protected]
4353

4454
position_SOURCES = position.c
4555
position_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
46-
position_LDADD = $(top_builddir)/ompi/libmpi.la
56+
position_LDADD = \
57+
$(top_builddir)/ompi/libmpi.la \
58+
$(top_builddir)/opal/lib@[email protected]
4759

4860
position_noncontig_SOURCES = position_noncontig.c
4961
position_noncontig_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
50-
position_noncontig_LDADD = $(top_builddir)/ompi/libmpi.la
62+
position_noncontig_LDADD = \
63+
$(top_builddir)/ompi/libmpi.la \
64+
$(top_builddir)/opal/lib@[email protected]
5165

5266
to_self_SOURCES = to_self.c
5367
to_self_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
5468
to_self_LDADD = $(top_builddir)/ompi/libmpi.la
5569

5670
opal_datatype_test_SOURCES = opal_datatype_test.c opal_ddt_lib.c opal_ddt_lib.h
5771
opal_datatype_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
58-
opal_datatype_test_LDADD = $(top_builddir)/opal/libopen-pal.la
59-
72+
opal_datatype_test_LDADD = \
73+
$(top_builddir)/opal/lib@[email protected]

0 commit comments

Comments
 (0)