Skip to content

v3.1.0: monitoring .so versioning #4844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 20, 2018
Merged

v3.1.0: monitoring .so versioning #4844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4df6ee
ompi/monitoring: add .so versionig to common monitoring lib
jsquyres Feb 20, 2018
09fda85
VERSION: set C:R:A for common monitoring library
jsquyres Feb 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ libompitrace_so_version=50:0:10

# OMPI layer
libmca_ompi_common_ompio_so_version=50:0:9
libmca_ompi_common_monitoring_so_version=50:0:0

# ORTE layer
libmca_orte_common_alps_so_version=50:0:10
Expand Down
3 changes: 2 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2006-2018 Cisco Systems, Inc. All rights reserved
# Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved.
# Copyright (c) 2006-2017 Los Alamos National Security, LLC. All rights
# reserved.
Expand Down Expand Up @@ -170,6 +170,7 @@ AC_SUBST(libmca_opal_common_ugni_so_version)
AC_SUBST(libmca_opal_common_verbs_so_version)
AC_SUBST(libmca_orte_common_alps_so_version)
AC_SUBST(libmca_ompi_common_ompio_so_version)
AC_SUBST(libmca_ompi_common_monitoring_so_version)

#
# Get the versions of the autotools that were used to bootstrap us
Expand Down
6 changes: 4 additions & 2 deletions ompi/mca/common/monitoring/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# Copyright (c) 2016 Inria. All rights reserved.
# Copyright (c) 2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# Copyright (c) 2018 Cisco Systems, Inc. All rights reserved
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand Down Expand Up @@ -37,13 +38,14 @@ if OPAL_INSTALL_BINARIES
bin_SCRIPTS = profile2mat.pl aggregate_profile.pl
endif # OPAL_INSTALL_BINARIES

else
else # MCA_BUILD_ompi_common_monitoring_DSO
noinst_LTLIBRARIES += $(component_noinst)
endif
endif # MCA_BUILD_ompi_common_monitoring_DSO

libmca_common_monitoring_la_SOURCES = $(headers) $(sources)
libmca_common_monitoring_la_CPPFLAGS = $(common_monitoring_CPPFLAGS)
libmca_common_monitoring_la_LDFLAGS = \
-version-info $(libmca_ompi_common_monitoring_so_version) \
$(common_monitoring_LDFLAGS)
libmca_common_monitoring_la_LIBADD = $(common_monitoring_LIBS)
libmca_common_monitoring_noinst_la_SOURCES = $(headers) $(sources)
Expand Down