Merge pull request #1687 from ggouaillardet/topic/distclean_external
configury: correctly perform make distclean when {libevent,hwloc,pmix…
Этот коммит содержится в:
Jeff Squyres
GitHub
Коммит
b8e93e9738
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights reserved.
|
||||
# Copyright (c) 2015 Intel, Inc. All rights reserved.
|
||||
# Copyright (c) 2015 Research Organization for Information Science
|
||||
# Copyright (c) 2015-2016 Research Organization for Information Science
|
||||
# and Technology (RIST). All rights reserved.
|
||||
#
|
||||
# $COPYRIGHT$
|
||||
@ -91,15 +91,6 @@ AC_DEFUN([MCA_opal_event_libevent2022_CONFIG],[
|
||||
AC_CONFIG_FILES([opal/mca/event/libevent2022/Makefile])
|
||||
libevent_basedir="opal/mca/event/libevent2022"
|
||||
|
||||
# If we're not building externally, configure this component
|
||||
AS_IF([test "$with_libevent" = "internal" || test -z "$with_libevent" || test "$with_libevent" = "yes"],
|
||||
[MCA_opal_event_libevent2022_DO_THE_CONFIG],
|
||||
[AC_MSG_WARN([using an external libevent; disqualifiying this component])
|
||||
$2])
|
||||
OPAL_VAR_SCOPE_POP
|
||||
])
|
||||
|
||||
AC_DEFUN([MCA_opal_event_libevent2022_DO_THE_CONFIG], [
|
||||
CFLAGS_save="$CFLAGS"
|
||||
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"
|
||||
CPPFLAGS_save="$CPPFLAGS"
|
||||
@ -189,9 +180,23 @@ AC_DEFUN([MCA_opal_event_libevent2022_DO_THE_CONFIG], [
|
||||
# libevent/include/event2/event-config.h!). Otherwise, set it to
|
||||
# 0.
|
||||
libevent_file=$libevent_basedir/libevent/config.h
|
||||
|
||||
# If we are not building the internal libevent, then indicate that
|
||||
# this component should not be built. NOTE: we still did all the
|
||||
# above configury so that all the proper GNU Autotools
|
||||
# infrastructure is setup properly (e.g., w.r.t. SUBDIRS=libevent in
|
||||
# this directory's Makefile.am, we still need the Autotools "make
|
||||
# distclean" infrastructure to work properly).
|
||||
|
||||
AS_IF([test "$with_libevent" != "internal" && test -n "$with_libevent" && test "$with_libevent" != "yes"],
|
||||
[AC_MSG_WARN([using an external libevent; disqualifying this component])
|
||||
libevent_happy=no])
|
||||
|
||||
AS_IF([test "$libevent_happy" = "yes" && test -r $libevent_file],
|
||||
[OPAL_HAVE_WORKING_EVENTOPS=`grep HAVE_WORKING_EVENTOPS $libevent_file | awk '{print [$]3 }'`
|
||||
$1],
|
||||
[$2
|
||||
OPAL_HAVE_WORKING_EVENTOPS=0])
|
||||
|
||||
OPAL_VAR_SCOPE_POP
|
||||
])
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
|
||||
# Copyright (c) 2015 Research Organization for Information Science
|
||||
# Copyright (c) 2015-2016 Research Organization for Information Science
|
||||
# and Technology (RIST). All rights reserved.
|
||||
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
|
||||
# reserved.
|
||||
@ -72,20 +72,24 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
|
||||
|
||||
AC_CONFIG_FILES([opal/mca/hwloc/hwloc1113/Makefile])
|
||||
|
||||
OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc1113_save_CPPFLAGS opal_hwloc_hwloc1113_save_LDFLAGS opal_hwloc_hwloc1113_save_LIBS opal_hwloc_hwloc1113_save_cairo opal_hwloc_hwloc1113_save_xml opal_hwloc_hwloc1113_basedir opal_hwloc_hwloc1113_file opal_hwloc_hwloc1113_save_cflags CPPFLAGS_save LIBS_save])
|
||||
OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc1113_save_CPPFLAGS opal_hwloc_hwloc1113_save_LDFLAGS opal_hwloc_hwloc1113_save_LIBS opal_hwloc_hwloc1113_save_cairo opal_hwloc_hwloc1113_save_xml opal_hwloc_hwloc1113_basedir opal_hwloc_hwloc1113_file opal_hwloc_hwloc1113_save_cflags CPPFLAGS_save LIBS_save opal_hwloc_external])
|
||||
|
||||
# default to this component not providing support
|
||||
opal_hwloc_hwloc1113_basedir=opal/mca/hwloc/hwloc1113
|
||||
opal_hwloc_hwloc1113_support=no
|
||||
|
||||
if test "$with_hwloc" = "internal" || test -z "$with_hwloc" || test "$with_hwloc" = "yes"; then
|
||||
AS_IF([test "$with_hwloc" = "internal" || test -z "$with_hwloc" || test "$with_hwloc" = "yes"],
|
||||
[opal_hwloc_external="no"],
|
||||
[opal_hwloc_external="yes"])
|
||||
|
||||
opal_hwloc_hwloc1113_save_CPPFLAGS=$CPPFLAGS
|
||||
opal_hwloc_hwloc1113_save_LDFLAGS=$LDFLAGS
|
||||
opal_hwloc_hwloc1113_save_LIBS=$LIBS
|
||||
|
||||
# Run the hwloc configuration - set the prefix to minimize
|
||||
# the chance that someone will use the internal symbols
|
||||
HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1113_])
|
||||
# Run the hwloc configuration - if no external hwloc, then set the prefixi
|
||||
# to minimize the chance that someone will use the internal symbols
|
||||
AS_IF([test "$opal_hwloc_external" = "no"],
|
||||
[HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1113_])])
|
||||
|
||||
# save XML or graphical options
|
||||
opal_hwloc_hwloc1113_save_cairo=$enable_cairo
|
||||
@ -163,7 +167,16 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
|
||||
hwloc_hwloc1113_WRAPPER_EXTRA_LDFLAGS="$HWLOC_EMBEDDED_LDFLAGS"
|
||||
hwloc_hwloc1113_WRAPPER_EXTRA_LIBS="$HWLOC_EMBEDDED_LIBS"
|
||||
hwloc_hwloc1113_WRAPPER_EXTRA_CPPFLAGS='-I${pkgincludedir}/'"$opal_hwloc_hwloc1113_basedir/hwloc/include"
|
||||
fi
|
||||
|
||||
# If we are not building the internal hwloc, then indicate that
|
||||
# this component should not be built. NOTE: we still did all the
|
||||
# above configury so that all the proper GNU Autotools
|
||||
# infrastructure is setup properly (e.g., w.r.t. SUBDIRS=hwloc in
|
||||
# this directory's Makefile.am, we still need the Autotools "make
|
||||
# distclean" infrastructure to work properly).
|
||||
AS_IF([test "$opal_hwloc_external" = "yes"],
|
||||
[AC_MSG_WARN([using an external hwloc; disqualifying this component])
|
||||
opal_hwloc_hwloc1113_support=no])
|
||||
|
||||
# Done!
|
||||
AS_IF([test "$opal_hwloc_hwloc1113_support" = "yes"],
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2010-2016 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
|
||||
# Copyright (c) 2015 Research Organization for Information Science
|
||||
# Copyright (c) 2015-2016 Research Organization for Information Science
|
||||
# and Technology (RIST). All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
@ -30,10 +30,7 @@ AC_DEFUN([MCA_opal_pmix_pmix2x_CONFIG],[
|
||||
|
||||
OPAL_VAR_SCOPE_PUSH([PMIX_VERSION opal_pmix_pmix2x_save_CPPFLAGS opal_pmix_pmix2x_save_LDFLAGS opal_pmix_pmix2x_save_LIBS opal_pmix_pmix2x_basedir opal_pmix_pmix2x_save_cflags])
|
||||
|
||||
AS_IF([test "$opal_external_pmix_happy" = "yes"],
|
||||
[AC_MSG_WARN([using an external pmix; disqualifiying this component])
|
||||
opal_pmix_pmix2x_happy=0],
|
||||
[PMIX_VERSION=
|
||||
PMIX_VERSION=
|
||||
opal_pmix_pmix2x_basedir=opal/mca/pmix/pmix2x
|
||||
|
||||
opal_pmix_pmix2x_save_CFLAGS=$CFLAGS
|
||||
@ -67,7 +64,16 @@ AC_DEFUN([MCA_opal_pmix_pmix2x_CONFIG],[
|
||||
CPPFLAGS=$opal_pmix_pmix2x_save_CPPFLAGS
|
||||
LDFLAGS=$opal_pmix_pmix2x_save_LDFLAGS
|
||||
LIBS=$opal_pmix_pmix2x_save_LIBS
|
||||
])
|
||||
|
||||
# If we are not building the internal pmix, then indicate that
|
||||
# this component should not be built. NOTE: we still did all the
|
||||
# above configury so that all the proper GNU Autotools
|
||||
# infrastructure is setup properly (e.g., w.r.t. SUBDIRS=pmix in
|
||||
# this directory's Makefile.am, we still need the Autotools "make
|
||||
# distclean" infrastructure to work properly).
|
||||
AS_IF([test "$opal_external_pmix_happy" = "yes"],
|
||||
[AC_MSG_WARN([using an external pmix; disqualifying this component])
|
||||
opal_pmix_pmix2x_happy=0])
|
||||
|
||||
AS_IF([test $opal_pmix_pmix2x_happy -eq 1],
|
||||
[$1],
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user