From b8dfd9a92bc725ed35accb22adf9cb15f1187652 Mon Sep 17 00:00:00 2001 From: Joshua Hursey Date: Mon, 12 Sep 2016 17:10:03 -0400 Subject: [PATCH] libompitrace: Use VERSION file to set .so version --- VERSION | 2 ++ configure.ac | 4 +++- ompi/contrib/libompitrace/Makefile.am | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 1add62a40a..fb771b4c6e 100644 --- a/VERSION +++ b/VERSION @@ -3,6 +3,7 @@ # Copyright (c) 2011 NVIDIA Corporation. All rights reserved. # Copyright (c) 2013 Mellanox Technologies, Inc. # All rights reserved. +# Copyright (c) 2016 IBM Corporation. All rights reserved. # This is the VERSION file for Open MPI, describing the precise # version of Open MPI in this distribution. The various components of @@ -91,6 +92,7 @@ libopen_rte_so_version=0:0:0 libopen_pal_so_version=0:0:0 libmpi_java_so_version=0:0:0 liboshmem_so_version=0:0:0 +libompitrace_so_version=0:0:0 # "Common" components install standalone libraries that are run-time # linked by one or more components. So they need to be versioned as diff --git a/configure.ac b/configure.ac index b4dc5d2580..c38f8e9c25 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,7 @@ # Copyright (c) 2013-2014 Intel, Inc. All rights reserved. # Copyright (c) 2014-2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. +# Copyright (c) 2016 IBM Corporation. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -134,7 +135,8 @@ m4_ifdef([project_ompi], AC_SUBST(libmpi_usempi_tkr_so_version) AC_SUBST(libmpi_usempi_ignore_tkr_so_version) AC_SUBST(libmpi_usempif08_so_version) - AC_SUBST(libmpi_java_so_version)]) + AC_SUBST(libmpi_java_so_version) + AC_SUBST(libompitrace_so_version)]) m4_ifdef([project_orte], [AC_SUBST(libopen_rte_so_version)]) m4_ifdef([project_oshmem], diff --git a/ompi/contrib/libompitrace/Makefile.am b/ompi/contrib/libompitrace/Makefile.am index c6aaf91f7b..9b4cbdf5e8 100644 --- a/ompi/contrib/libompitrace/Makefile.am +++ b/ompi/contrib/libompitrace/Makefile.am @@ -11,6 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2016 IBM Corporation. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -42,4 +43,4 @@ libompitrace_la_SOURCES = \ send.c \ sendrecv.c -libompitrace_la_LDFLAGS = -version-info 0:0:0 +libompitrace_la_LDFLAGS = -version-info $(libompitrace_so_version)