Skip to content

Commit a7dfd94

Browse files
authored
Merge pull request open-mpi#4844 from jsquyres/pr/v3.1/monitoring-so-versioning
v3.1.0: monitoring .so versioning
2 parents ecac676 + 09fda85 commit a7dfd94

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ libompitrace_so_version=50:0:10
103103

104104
# OMPI layer
105105
libmca_ompi_common_ompio_so_version=50:0:9
106+
libmca_ompi_common_monitoring_so_version=50:0:0
106107

107108
# ORTE layer
108109
libmca_orte_common_alps_so_version=50:0:10

configure.ac

Lines changed: 2 additions & 1 deletion
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) 2006-2016 Cisco Systems, Inc. All rights reserved.
13+
# Copyright (c) 2006-2018 Cisco Systems, Inc. All rights reserved
1414
# Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved.
1515
# Copyright (c) 2006-2017 Los Alamos National Security, LLC. All rights
1616
# reserved.
@@ -170,6 +170,7 @@ AC_SUBST(libmca_opal_common_ugni_so_version)
170170
AC_SUBST(libmca_opal_common_verbs_so_version)
171171
AC_SUBST(libmca_orte_common_alps_so_version)
172172
AC_SUBST(libmca_ompi_common_ompio_so_version)
173+
AC_SUBST(libmca_ompi_common_monitoring_so_version)
173174

174175
#
175176
# Get the versions of the autotools that were used to bootstrap us

ompi/mca/common/monitoring/Makefile.am

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# Copyright (c) 2016 Inria. All rights reserved.
66
# Copyright (c) 2017 Research Organization for Information Science
77
# and Technology (RIST). All rights reserved.
8+
# Copyright (c) 2018 Cisco Systems, Inc. All rights reserved
89
# $COPYRIGHT$
910
#
1011
# Additional copyrights may follow
@@ -37,13 +38,14 @@ if OPAL_INSTALL_BINARIES
3738
bin_SCRIPTS = profile2mat.pl aggregate_profile.pl
3839
endif # OPAL_INSTALL_BINARIES
3940

40-
else
41+
else # MCA_BUILD_ompi_common_monitoring_DSO
4142
noinst_LTLIBRARIES += $(component_noinst)
42-
endif
43+
endif # MCA_BUILD_ompi_common_monitoring_DSO
4344

4445
libmca_common_monitoring_la_SOURCES = $(headers) $(sources)
4546
libmca_common_monitoring_la_CPPFLAGS = $(common_monitoring_CPPFLAGS)
4647
libmca_common_monitoring_la_LDFLAGS = \
48+
-version-info $(libmca_ompi_common_monitoring_so_version) \
4749
$(common_monitoring_LDFLAGS)
4850
libmca_common_monitoring_la_LIBADD = $(common_monitoring_LIBS)
4951
libmca_common_monitoring_noinst_la_SOURCES = $(headers) $(sources)

0 commit comments

Comments
 (0)