configury: fixes for OPAL|ORTE_SET_LIB_PREFIX
We must also set the static library filenames properly (i.e., obey the $FRAMEWORK_LIB_PREFIX that was set). Hence, set the prefixes earlier in configure.ac, and update OPAL_MCA to set the static library names properly.
Этот коммит содержится в:
родитель
6af465f12d
Коммит
aefe3f2edd
@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|||||||
dnl University of Stuttgart. All rights reserved.
|
dnl University of Stuttgart. All rights reserved.
|
||||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
dnl All rights reserved.
|
dnl All rights reserved.
|
||||||
dnl Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved.
|
dnl Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved.
|
||||||
dnl Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
|
dnl Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
|
||||||
dnl $COPYRIGHT$
|
dnl $COPYRIGHT$
|
||||||
dnl
|
dnl
|
||||||
@ -738,7 +738,16 @@ AC_DEFUN([MCA_PROCESS_COMPONENT],[
|
|||||||
if test "$8" = "dso" ; then
|
if test "$8" = "dso" ; then
|
||||||
$6="$$6 $3"
|
$6="$$6 $3"
|
||||||
else
|
else
|
||||||
$7="mca/$2/$3/libmca_$2_$3.la $$7"
|
if test "$2" = "common"; then
|
||||||
|
# Static libraries in "common" frameworks are installed, and
|
||||||
|
# therefore must obey the $FRAMEWORK_LIB_PREFIX that was
|
||||||
|
# set.
|
||||||
|
$7="mca/$2/$3/lib${m4_translit([$1], [a-z], [A-Z])_LIB_PREFIX}mca_$2_$3.la $$7"
|
||||||
|
else
|
||||||
|
# Other frameworks do not have to obey the
|
||||||
|
# $FRAMEWORK_LIB_PREFIX prefix.
|
||||||
|
$7="mca/$2/$3/libmca_$2_$3.la $$7"
|
||||||
|
fi
|
||||||
echo "extern const mca_base_component_t mca_$2_$3_component;" >> $outfile.extern
|
echo "extern const mca_base_component_t mca_$2_$3_component;" >> $outfile.extern
|
||||||
echo " &mca_$2_$3_component, " >> $outfile.struct
|
echo " &mca_$2_$3_component, " >> $outfile.struct
|
||||||
$5="$$5 $3"
|
$5="$$5 $3"
|
||||||
|
10
configure.ac
10
configure.ac
@ -277,6 +277,12 @@ if test "$enable_binaries" = "no" -a "$enable_dist" = "yes"; then
|
|||||||
AC_MSG_ERROR([Cannot continue])
|
AC_MSG_ERROR([Cannot continue])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# The library prefixes must be set before we call OPAL MCA. Here is
|
||||||
|
# as good a place as any.
|
||||||
|
OPAL_SET_LIB_PREFIX([jeffopal])
|
||||||
|
m4_ifdef([project_orte],
|
||||||
|
ORTE_SET_LIB_PREFIX([jefforte])])
|
||||||
|
|
||||||
############################################################################
|
############################################################################
|
||||||
# Libtool: part one
|
# Libtool: part one
|
||||||
# (before C compiler setup)
|
# (before C compiler setup)
|
||||||
@ -1407,7 +1413,6 @@ AC_SUBST(opaldatadir)
|
|||||||
AC_SUBST(opallibdir)
|
AC_SUBST(opallibdir)
|
||||||
AC_SUBST(opalincludedir)
|
AC_SUBST(opalincludedir)
|
||||||
|
|
||||||
OPAL_SET_LIB_PREFIX([])
|
|
||||||
OPAL_SET_MCA_PREFIX([OMPI_MCA_])
|
OPAL_SET_MCA_PREFIX([OMPI_MCA_])
|
||||||
OPAL_SET_MCA_CMD_LINE_ID([mca])
|
OPAL_SET_MCA_CMD_LINE_ID([mca])
|
||||||
m4_ifdef([project_orte],
|
m4_ifdef([project_orte],
|
||||||
@ -1416,8 +1421,7 @@ m4_ifdef([project_orte],
|
|||||||
ortelibdir="$opallibdir"
|
ortelibdir="$opallibdir"
|
||||||
AC_SUBST(ortelibdir)
|
AC_SUBST(ortelibdir)
|
||||||
orteincludedir="$opalincludedir"
|
orteincludedir="$opalincludedir"
|
||||||
AC_SUBST(orteincludedir)
|
AC_SUBST(orteincludedir)])
|
||||||
ORTE_SET_LIB_PREFIX([])])
|
|
||||||
m4_ifdef([project_ompi],
|
m4_ifdef([project_ompi],
|
||||||
[ompidatadir="$opaldatadir"
|
[ompidatadir="$opaldatadir"
|
||||||
AC_SUBST(ompidatadir)
|
AC_SUBST(ompidatadir)
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user