1
1

We also need .so versioning of the OMPI "common" components since they

are installed as standalone libraries in $libdir.

This commit was SVN r22148.
Этот коммит содержится в:
Jeff Squyres 2009-10-27 20:58:34 +00:00
родитель 59156cd92a
Коммит a6c1fe888f
5 изменённых файлов: 24 добавлений и 1 удалений

Просмотреть файл

@ -85,3 +85,12 @@ libmpi_f77_so_version=0:0:0
libmpi_f90_so_version=0:0:0
libopen_rte_so_version=0:0:0
libopen_pal_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
# well. Yuck; this somewhat breaks the
# components-don't-affect-the-build-system abstraction.
libmca_common_sm_so_version=0:0:0
libmca_common_mx_so_version=0:0:0
libmca_common_portals_so_version=0:0:0

Просмотреть файл

@ -92,7 +92,15 @@ m4_ifdef([project_ompi],
[AC_SUBST(libmpi_so_version)
AC_SUBST(libmpi_cxx_so_version)
AC_SUBST(libmpi_f77_so_version)
AC_SUBST(libmpi_f90_so_version)])
AC_SUBST(libmpi_f90_so_version)
# It's icky that we have to hard-code the names of the
# common components here. :-( This could probably be done
# transparently by adding some intelligence in autogen.sh
# and/or ompi_mca.m4, but I don't have the cycles to do this
# right now.
AC_SUBST(libmca_common_sm_so_version)
AC_SUBST(libmca_common_mx_so_version)
AC_SUBST(libmca_common_portals_so_version)])
m4_ifdef([project_orte],
[AC_SUBST(libopen_rte_so_version)])
AC_SUBST(libopen_pal_so_version)

Просмотреть файл

@ -9,6 +9,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -64,6 +65,7 @@ endif
libmca_common_mx_la_SOURCES = $(headers) $(sources)
libmca_common_mx_la_LDFLAGS = $(common_mx_LDFLAGS)
libmca_common_mx_la_LIBADD = $(common_mx_LIBS)
libmca_common_mx_la_LDFLAGS = -version-info $(libmca_common_mx_so_version)
libmca_common_mx_noinst_la_SOURCES = $(libmca_common_mx_la_SOURCES)
libmca_common_mx_noinst_la_LDFLAGS = $(common_mx_LDFLAGS)

Просмотреть файл

@ -9,6 +9,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -82,6 +83,7 @@ endif
libmca_common_portals_la_SOURCES = $(headers) $(sources)
libmca_common_portals_la_LDFLAGS = $(common_portals_LDFLAGS)
libmca_common_portals_la_LIBADD = $(common_portals_LIBS)
libmca_common_portals_la_LDFLAGS = -version-info $(libmca_common_portals_so_version)
libmca_common_portals_noinst_la_SOURCES = $(libmca_common_portals_la_SOURCES)
libmca_common_portals_noinst_la_LDFLAGS = $(common_portals_LDFLAGS)

Просмотреть файл

@ -9,6 +9,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -81,6 +82,7 @@ noinst_LTLIBRARIES += $(comp_noinst)
endif
libmca_common_sm_la_SOURCES = $(headers) $(sources)
libmca_common_sm_la_LDFLAGS = -version-info $(libmca_common_sm_so_version)
libmca_common_sm_noinst_la_SOURCES = $(libmca_common_sm_la_SOURCES)
# Conditionally install the header files