1
1

Added shared library versions to those who were missing it.

The following common shared libraries did not have versioning:

 * ompi/common/ofacm
 * ompi/common/verbs
 * ompi/common/ugni

Additionally, we still had shared library versions in VERSION for the
following libraries, which no longer exist:

 * ompi/common/portals
 * opal/common/hwloc

This commit was SVN r29421.
Этот коммит содержится в:
Jeff Squyres 2013-10-10 13:25:57 +00:00
родитель e11233cb65
Коммит d9be19f011
5 изменённых файлов: 22 добавлений и 11 удалений

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

@ -106,9 +106,13 @@ libshmem_so_version=0:0:0
# well. Yuck; this somewhat breaks the # well. Yuck; this somewhat breaks the
# components-don't-affect-the-build-system abstraction. # components-don't-affect-the-build-system abstraction.
libmca_common_sm_so_version=0:0:0 # OMPI layer
libmca_common_mx_so_version=0:0:0
libmca_common_portals_so_version=0:0:0
libmca_common_cuda_so_version=0:0:0 libmca_common_cuda_so_version=0:0:0
libmca_opal_common_hwloc_so_version=0:0:0 libmca_common_mx_so_version=0:0:0
libmca_common_ofacm_so_version=0:0:0
libmca_common_sm_so_version=0:0:0
libmca_common_ugni_so_version=0:0:0
libmca_common_verbs_so_version=0:0:0
# OPAL layer
libmca_opal_common_pmi_so_version=0:0:0 libmca_opal_common_pmi_so_version=0:0:0

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

@ -141,15 +141,16 @@ m4_ifdef([project_ompi],
# transparently by adding some intelligence in autogen.sh # transparently by adding some intelligence in autogen.sh
# and/or ompi_mca.m4, but I don't have the cycles to do this # and/or ompi_mca.m4, but I don't have the cycles to do this
# right now. # right now.
AC_SUBST(libmca_common_sm_so_version)
AC_SUBST(libmca_common_mx_so_version)
AC_SUBST(libmca_common_cuda_so_version) AC_SUBST(libmca_common_cuda_so_version)
AC_SUBST(libmca_common_portals_so_version)]) AC_SUBST(libmca_common_mx_so_version)
AC_SUBST(libmca_common_ofacm_so_version)
AC_SUBST(libmca_common_sm_so_version)
AC_SUBST(libmca_common_ugni_so_version)
AC_SUBST(libmca_common_verbs_so_version)])
m4_ifdef([project_orte], m4_ifdef([project_orte],
[AC_SUBST(libopen_rte_so_version)]) [AC_SUBST(libopen_rte_so_version)])
m4_ifdef([project_oshmem], m4_ifdef([project_oshmem],
[AC_SUBST(libshmem_so_version)]) [AC_SUBST(libshmem_so_version)])
AC_SUBST(libmca_opal_common_hwloc_so_version)
AC_SUBST(libmca_opal_common_pmi_so_version) AC_SUBST(libmca_opal_common_pmi_so_version)
AC_SUBST(libopen_pal_so_version) AC_SUBST(libopen_pal_so_version)

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

@ -48,7 +48,9 @@ endif
libmca_common_ofacm_la_SOURCES = $(headers) $(sources) libmca_common_ofacm_la_SOURCES = $(headers) $(sources)
libmca_common_ofacm_la_CPPFLAGS = $(common_ofacm_CPPFLAGS) libmca_common_ofacm_la_CPPFLAGS = $(common_ofacm_CPPFLAGS)
libmca_common_ofacm_la_LDFLAGS = $(common_ofacm_LDFLAGS) libmca_common_ofacm_la_LDFLAGS = \
-version-info $(libmca_common_ofacm_so_version) \
$(common_ofacm_LDFLAGS)
libmca_common_ofacm_la_LIBADD = $(common_ofacm_LIBS) libmca_common_ofacm_la_LIBADD = $(common_ofacm_LIBS)
libmca_common_ofacm_noinst_la_SOURCES = $(libmca_common_ofacm_la_SOURCES) libmca_common_ofacm_noinst_la_SOURCES = $(libmca_common_ofacm_la_SOURCES)

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

@ -34,7 +34,9 @@ mcacomponent_LTLIBRARIES = $(component_install)
mca_common_ugni_la_SOURCES = $(headers) $(ugni_SOURCES) mca_common_ugni_la_SOURCES = $(headers) $(ugni_SOURCES)
nodist_mca_common_ugni_la_SOURCES = $(ugni_nodist_SOURCES) nodist_mca_common_ugni_la_SOURCES = $(ugni_nodist_SOURCES)
mca_common_ugni_la_LIBADD = $(common_ugni_LIBS) mca_common_ugni_la_LIBADD = $(common_ugni_LIBS)
mca_common_ugni_la_LDFLAGS = -module -avoid-version $(common_ugni_LDFLAGS) mca_common_ugni_la_LDFLAGS = \
-version-info $(libmca_common_ugni_so_version) \
$(common_ugni_LDFLAGS)
noinst_LTLIBRARIES = $(component_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_common_ugni_la_SOURCES = $(headers) $(ugni_SOURCES) libmca_common_ugni_la_SOURCES = $(headers) $(ugni_SOURCES)

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

@ -49,7 +49,9 @@ endif
libmca_common_verbs_la_SOURCES = $(headers) $(sources) libmca_common_verbs_la_SOURCES = $(headers) $(sources)
# TBD: create own config file # TBD: create own config file
libmca_common_verbs_la_CPPFLAGS = $(common_verbs_CPPFLAGS) libmca_common_verbs_la_CPPFLAGS = $(common_verbs_CPPFLAGS)
libmca_common_verbs_la_LDFLAGS = $(common_verbs_LDFLAGS) libmca_common_verbs_la_LDFLAGS = \
-version-info $(libmca_common_verbs_so_version) \
$(common_verbs_LDFLAGS)
libmca_common_verbs_la_LIBADD = $(common_verbs_LIBS) libmca_common_verbs_la_LIBADD = $(common_verbs_LIBS)
libmca_common_verbs_noinst_la_SOURCES = $(libmca_common_verbs_la_SOURCES) libmca_common_verbs_noinst_la_SOURCES = $(libmca_common_verbs_la_SOURCES)