1
1

BUILD: add support for --with-platform-patches-dir=DIR

sync with https://github.com/open-mpi/ompi-release/pull/662
Этот коммит содержится в:
Mike Dubman 2015-10-20 17:14:15 +03:00
родитель 630d6bf800
Коммит 14d7fcbe2d

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

@ -101,10 +101,18 @@ AC_DEFUN([OPAL_LOAD_PLATFORM], [
AC_SUBST(OPAL_PARAM_FROM_PLATFORM, "no") AC_SUBST(OPAL_PARAM_FROM_PLATFORM, "no")
fi fi
if test -d "$with_platform_patches_dir"; then patch_dir="${with_platform}.patches"
patch_dir=$with_platform_patches_dir if test -n "$with_platform_patches_dir"; then
else if test "$with_platform_patches_dir" = "yes"; then
patch_dir="${with_platform}.patches" patch_dir="${with_platform}.patches"
elif test "$with_platform_patches_dir" = "no"; then
AC_MSG_NOTICE([Disabling platform patches on user request])
patch_dir=""
elif test -d "$with_platform_patches_dir"; then
patch_dir=$with_platform_patches_dir
else
AC_MSG_ERROR([User provided patches directory: $with_platform_patches_dir not found])
fi
fi fi
patch_done="${srcdir}/.platform_patches" patch_done="${srcdir}/.platform_patches"
@ -164,15 +172,16 @@ AC_DEFUN([OPAL_LOAD_PLATFORM], [
AC_MSG_NOTICE([Platform patches applied, created stamp file ${patch_done}]) AC_MSG_NOTICE([Platform patches applied, created stamp file ${patch_done}])
touch ${patch_done} touch ${patch_done}
else
AC_MSG_NOTICE([No platform patches in ${patch_dir}])
fi fi
else else
AC_MSG_WARN([Platform patches already applied, skipping. ${patch_done} can be removed to re-apply ]) AC_MSG_WARN([Platform patches already applied, skipping. ${patch_done} can be removed to re-apply ])
fi fi
else elif test -n "${patch_dir}"; then
AC_MSG_NOTICE([No platform patches in ${patch_dir}]) AC_MSG_NOTICE([No platform patches in ${patch_dir}])
fi fi
else else
AC_SUBST(OPAL_DEFAULT_MCA_PARAM_CONF, [openmpi-mca-params.conf]) AC_SUBST(OPAL_DEFAULT_MCA_PARAM_CONF, [openmpi-mca-params.conf])
fi fi