Skip to content

Commit 4159fee

Browse files
authored
Merge pull request #2073 from jjhursey/topic/ompitrace-version
libompitrace: Use VERSION file to set .so version
2 parents 5a14907 + b8dfd9a commit 4159fee

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

VERSION

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Copyright (c) 2011 NVIDIA Corporation. All rights reserved.
44
# Copyright (c) 2013 Mellanox Technologies, Inc.
55
# All rights reserved.
6+
# Copyright (c) 2016 IBM Corporation. All rights reserved.
67

78
# This is the VERSION file for Open MPI, describing the precise
89
# version of Open MPI in this distribution. The various components of
@@ -91,6 +92,7 @@ libopen_rte_so_version=0:0:0
9192
libopen_pal_so_version=0:0:0
9293
libmpi_java_so_version=0:0:0
9394
liboshmem_so_version=0:0:0
95+
libompitrace_so_version=0:0:0
9496

9597
# "Common" components install standalone libraries that are run-time
9698
# linked by one or more components. So they need to be versioned as

configure.ac

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
# Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
2323
# Copyright (c) 2014-2016 Research Organization for Information Science
2424
# and Technology (RIST). All rights reserved.
25+
# Copyright (c) 2016 IBM Corporation. All rights reserved.
2526
# $COPYRIGHT$
2627
#
2728
# Additional copyrights may follow
@@ -134,7 +135,8 @@ m4_ifdef([project_ompi],
134135
AC_SUBST(libmpi_usempi_tkr_so_version)
135136
AC_SUBST(libmpi_usempi_ignore_tkr_so_version)
136137
AC_SUBST(libmpi_usempif08_so_version)
137-
AC_SUBST(libmpi_java_so_version)])
138+
AC_SUBST(libmpi_java_so_version)
139+
AC_SUBST(libompitrace_so_version)])
138140
m4_ifdef([project_orte],
139141
[AC_SUBST(libopen_rte_so_version)])
140142
m4_ifdef([project_oshmem],

ompi/contrib/libompitrace/Makefile.am

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
1313
# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
14+
# Copyright (c) 2016 IBM Corporation. All rights reserved.
1415
# $COPYRIGHT$
1516
#
1617
# Additional copyrights may follow
@@ -42,4 +43,4 @@ libompitrace_la_SOURCES = \
4243
send.c \
4344
sendrecv.c
4445

45-
libompitrace_la_LDFLAGS = -version-info 0:0:0
46+
libompitrace_la_LDFLAGS = -version-info $(libompitrace_so_version)

0 commit comments

Comments
 (0)