Skip to content

Commit 075153d

Browse files
committed
abi: set so version for libmpi_abi.so
We need separate so version for libmpi_abi.so, which is different from that for libmpi.so.
1 parent 4912a1a commit 075153d

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ if BUILD_PROFILING_LIB
167167
# don't contribute any PMPI symbols.
168168
lib_LTLIBRARIES += lib/lib@[email protected]
169169
lib_lib@PMPIABILIBNAME@_la_SOURCES = $(mpi_abi_sources) $(mpi_f77_sources) $(mpi_core_sources)
170-
lib_lib@PMPIABILIBNAME@_la_LDFLAGS = $(external_ldflags) $(ABIVERSIONFLAGS)
170+
lib_lib@PMPIABILIBNAME@_la_LDFLAGS = $(external_ldflags) $(ABI_ABIVERSIONFLAGS)
171171
lib_lib@PMPIABILIBNAME@_la_CPPFLAGS = $(AM_CPPFLAGS) -DF77_USE_PMPI $(abi_cppflags)
172172
lib_lib@PMPIABILIBNAME@_la_LIBADD = $(external_libs) $(pmpi_convenience_libs) $(abi_convenience_libs)
173173
EXTRA_lib_lib@PMPIABILIBNAME@_la_DEPENDENCIES = $(pmpi_convenience_libs) $(abi_convenience_libs)
@@ -177,15 +177,15 @@ EXTRA_lib_lib@PMPIABILIBNAME@_la_DEPENDENCIES = $(pmpi_convenience_libs) $(abi_c
177177
# confused. (see https://bugzilla.redhat.com/show_bug.cgi?id=91110)
178178
lib_LTLIBRARIES += lib/lib@[email protected]
179179
lib_lib@MPIABILIBNAME@_la_SOURCES = $(mpi_abi_sources)
180-
lib_lib@MPIABILIBNAME@_la_LDFLAGS = $(ABIVERSIONFLAGS)
180+
lib_lib@MPIABILIBNAME@_la_LDFLAGS = $(ABI_ABIVERSIONFLAGS)
181181
lib_lib@MPIABILIBNAME@_la_CPPFLAGS = $(AM_CPPFLAGS) -DMPICH_MPI_FROM_PMPI $(abi_cppflags)
182182
lib_lib@MPIABILIBNAME@_la_LIBADD = lib/lib@[email protected]
183183

184184
else !BUILD_PROFILING_LIB
185185

186186
lib_LTLIBRARIES += lib/lib@[email protected]
187187
lib_lib@MPIABILIBNAME@_la_SOURCES = $(mpi_abi_sources) $(mpi_core_sources)
188-
lib_lib@MPIABILIBNAME@_la_LDFLAGS = $(external_ldflags) $(ABIVERSIONFLAGS)
188+
lib_lib@MPIABILIBNAME@_la_LDFLAGS = $(external_ldflags) $(ABI_ABIVERSIONFLAGS)
189189
lib_lib@MPIABILIBNAME@_la_CPPFLAGS = $(AM_CPPFLAGS) $(abi_cppflags)
190190
lib_lib@MPIABILIBNAME@_la_LIBADD = $(external_libs) $(pmpi_convenience_libs) $(abi_convenience_libs)
191191
EXTRA_lib_lib@MPIABILIBNAME@_la_DEPENDENCIES = $(pmpi_convenience_libs) $(abi_convenience_libs)

configure.ac

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,10 @@ AC_ARG_ENABLE(versioning,
495495

496496
if test "$enable_versioning" = "yes" ; then
497497
ABIVERSIONFLAGS="-version-info \$(ABIVERSION)"
498+
ABI_ABIVERSIONFLAGS="-version-info libmpi_abi_so_verion_m4"
498499
else
499500
ABIVERSIONFLAGS="-avoid-version"
501+
ABI_ABIVERSIONFLAGS="-avoid-version"
500502
fi
501503
export ABIVERSIONFLAGS
502504
AC_SUBST(ABIVERSIONFLAGS)

maint/version.m4

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,7 @@ m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl
4040
# last version 4.3.0 - 17:0:5
4141
m4_define([libmpi_so_version_m4],[0:0:0])dnl
4242

43+
# libmpi_abi.so version
44+
m4_define([libmpi_abi_so_version_m4],[1:0:0])dnl
45+
4346
[#] end of __file__

0 commit comments

Comments
 (0)