ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

configury: misc pmix120 fixes

Просмотр исходного кода
Этот коммит содержится в:
Gilles Gouaillardet 2015-12-28 23:17:41 +09:00
родитель 3300d7cc00
Коммит 0ca1ee5156
1 изменённых файлов: 31 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

66
opal/mca/pmix/pmix120/configure.m4
Просмотреть файл

@ -28,50 +28,46 @@
AC_DEFUN([MCA_opal_pmix_pmix120_CONFIG],[ AC_DEFUN([MCA_opal_pmix_pmix120_CONFIG],[
AC_CONFIG_FILES([opal/mca/pmix/pmix120/Makefile]) AC_CONFIG_FILES([opal/mca/pmix/pmix120/Makefile])
OPAL_VAR_SCOPE_PUSH([PMIX_VERSION opal_pmix_pmix120_save_CPPFLAGS opal_pmix_pmix120_save_LDFLAGS opal_pmix_pmix120_save_LIBS opal_pmix_pmix120_basedir opal_pmix_pmix120_save_cflags])
AS_IF([test "$opal_external_pmix_happy" = "yes"], AS_IF([test "$opal_external_pmix_happy" = "yes"],
[AC_MSG_WARN([using an external pmix; disqualifiying this component]) [AC_MSG_WARN([using an external pmix; disqualifiying this component])
opal_pmix_pmix120_happy=0], opal_pmix_pmix120_happy=0],
[PMIX_VERSION=
opal_pmix_pmix120_basedir=opal/mca/pmix/pmix120
[OPAL_VAR_SCOPE_PUSH([PMIX_VERSION opal_pmix_pmix120_save_CPPFLAGS opal_pmix_pmix120_save_LDFLAGS opal_pmix_pmix120_save_LIBS opal_pmix_pmix120_basedir opal_pmix_pmix120_save_cflags]) opal_pmix_pmix120_save_CFLAGS=$CFLAGS
opal_pmix_pmix120_save_CPPFLAGS=$CPPFLAGS
opal_pmix_pmix120_save_LDFLAGS=$LDFLAGS
opal_pmix_pmix120_save_LIBS=$LIBS
PMIX_VERSION= opal_pmix_pmix120_args="--enable-embedded-mode --with-pmix-symbol-prefix=opal_pmix_pmix120_ --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --with-hwloc-header=\\\"$opal_hwloc_base_include\\\""
opal_pmix_pmix120_basedir=opal/mca/pmix/pmix120 AS_IF([test "$enable_debug" = "yes"],
[opal_pmix_pmix120_args="--enable-debug $opal_pmix_pmix120_args"
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
[opal_pmix_pmix120_args="--disable-debug $opal_pmix_pmix120_args"
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS"
opal_pmix_pmix120_save_CFLAGS=$CFLAGS OPAL_CONFIG_SUBDIR([$opal_pmix_pmix120_basedir/pmix],
opal_pmix_pmix120_save_CPPFLAGS=$CPPFLAGS [$opal_pmix_pmix120_args $opal_subdir_args 'CFLAGS=$CFLAGS' 'CPPFLAGS=$CPPFLAGS'],
opal_pmix_pmix120_save_LDFLAGS=$LDFLAGS [opal_pmix_pmix120_happy=1], [opal_pmix_pmix120_happy=0])
opal_pmix_pmix120_save_LIBS=$LIBS
opal_pmix_pmix120_args="--enable-embedded-mode --with-pmix-symbol-prefix=opal_pmix_pmix120_ --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --with-hwloc-header=\\\"$opal_hwloc_base_include\\\"" AS_IF([test $opal_pmix_pmix120_happy -eq 1],
if test "$enable_debug" = "yes"; then [PMIX_VERSION="internal v`$srcdir/$opal_pmix_pmix120_basedir/pmix/config/pmix_get_version.sh $srcdir/$opal_pmix_pmix120_basedir/pmix/VERSION`"
opal_pmix_pmix120_args="--enable-debug $opal_pmix_pmix120_args" # Build flags for our Makefile.am
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g" opal_pmix_pmix120_LIBS='$(OPAL_TOP_BUILDDIR)/'"$opal_pmix_pmix120_basedir"'/pmix/libpmix.la'
else opal_pmix_pmix120_CPPFLAGS='-I$(OPAL_TOP_BUILDDIR)/opal/mca/pmix/pmix120/pmix/include/pmix -I$(OPAL_TOP_BUILDDIR)/opal/mca/pmix/pmix120/pmix/include -I$(OPAL_TOP_BUILDDIR)/opal/mca/pmix/pmix120/pmix -I$(OPAL_TOP_SRCDIR)/opal/mca/pmix/pmix120/pmix'
opal_pmix_pmix120_args="--disable-debug $opal_pmix_pmix120_args" AC_SUBST([opal_pmix_pmix120_LIBS])
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS" AC_SUBST([opal_pmix_pmix120_CPPFLAGS])])
fi
CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS"
OPAL_CONFIG_SUBDIR([$opal_pmix_pmix120_basedir/pmix], # Finally, add a flag to support static builds
[$opal_pmix_pmix120_args $opal_subdir_args 'CFLAGS=$CFLAGS' 'CPPFLAGS=$CPPFLAGS'], pmix_pmix120_WRAPPER_EXTRA_LIBS=-lpmix
[opal_pmix_pmix120_happy=1], [opal_pmix_pmix120_happy=0])
if test $opal_pmix_pmix120_happy -eq 1; then CFLAGS=$opal_pmix_pmix120_save_CFLAGS
PMIX_VERSION="internal v`$srcdir/$opal_pmix_pmix120_basedir/pmix/config/pmix_get_version.sh $srcdir/$opal_pmix_pmix120_basedir/pmix/VERSION`" CPPFLAGS=$opal_pmix_pmix120_save_CPPFLAGS
# Build flags for our Makefile.am LDFLAGS=$opal_pmix_pmix120_save_LDFLAGS
opal_pmix_pmix120_LIBS='$(OPAL_TOP_BUILDDIR)/'"$opal_pmix_pmix120_basedir"'/pmix/libpmix.la' LIBS=$opal_pmix_pmix120_save_LIBS
opal_pmix_pmix120_CPPFLAGS='-I$(OPAL_TOP_BUILDDIR)/opal/mca/pmix/pmix120/pmix/include/pmix -I$(OPAL_TOP_BUILDDIR)/opal/mca/pmix/pmix120/pmix/include -I$(OPAL_TOP_BUILDDIR)/opal/mca/pmix/pmix120/pmix -I$(OPAL_TOP_SRCDIR)/opal/mca/pmix/pmix120/pmix'
AC_SUBST([opal_pmix_pmix120_LIBS])
AC_SUBST([opal_pmix_pmix120_CPPFLAGS])
fi
# Finally, add a flag to support static builds
pmix_pmix120_WRAPPER_EXTRA_LIBS=-lpmix
CFLAGS=$opal_pmix_pmix120_save_CFLAGS
CPPFLAGS=$opal_pmix_pmix120_save_CPPFLAGS
LDFLAGS=$opal_pmix_pmix120_save_LDFLAGS
LIBS=$opal_pmix_pmix120_save_LIBS
]) ])
AS_IF([test $opal_pmix_pmix120_happy -eq 1], AS_IF([test $opal_pmix_pmix120_happy -eq 1],