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

* greatly simply the maffinity:libnuma configure macro - use the

Просмотр исходного кода 
OMPI_CHECK_PACKAGE macro instead of doing everything ourself.
  The old code was causing problems - it wouldn't add anything to
  WRAPPER_EXTRA_{LDFLAGS, LIBS} if libnuma was installed in /usr,
  so it didn't work so well.

  This should go to the 1.0 branch

This commit was SVN r7683.
Этот коммит содержится в:
Brian Barrett 2005-10-11 01:37:45 +00:00
родитель 5c98bbeae6
Коммит 1df9b160a9
1 изменённых файлов: 22 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

50
opal/mca/maffinity/libnuma/configure.m4
Просмотреть файл

@ -24,39 +24,33 @@ AC_DEFUN([MCA_maffinity_libnuma_CONFIG],[
[AC_HELP_STRING([--with-libnuma],
[Directory where the libnuma software is installed])])
ompi_check_maffinity_libnuma_save_CPPFLAGS="$CPPFLAGS"
ompi_check_maffinity_libnuma_save_LDFLAGS="$LDFLAGS"
ompi_check_maffinity_libnuma_save_LIBS="$LIBS"
AS_IF([test "$with_libnuma" = "no"],
[maffinity_libnuma_happy="no"],
[maffinity_libnuma_happy="yes"])
# libnuma, by default, installs into lib64/. So we're going to
# assume that's the common case. If this needs to be augmented
# someday to look in lib/ as well, then so be it.
AS_IF([test ! -z "$with_libnuma"],
[CPPFLAGS="$CPPFLAGS -I$with_libnuma/include"
LDFLAGS="$LDFLAGS -L$with_libnuma/lib64"])
AC_CHECK_HEADERS([numa.h],
[AC_CHECK_LIB([numa],
[numa_available],
[ompi_check_maffinity_libnuma_happy="yes"],
[ompi_check_maffinity_libnuma_happy="no"])],
[ompi_check_maffinity_libnuma_happy="no"])
AS_IF([test "$maffinity_libnuma_happy" = "yes"],
[OMPI_CHECK_PACKAGE([maffinity_libnuma],
[numa.h],
[numa],
[numa_available],
[],
[$with_libnuma],
[],
[maffinity_libnuma_happy="yes"],
[maffinity_libnuma_happy="no"])])
CPPFLAGS="$ompi_check_maffinity_libnuma_save_CPPFLAGS"
LDFLAGS="$ompi_check_maffinity_libnuma_save_LDFLAGS"
LIBS="$ompi_check_maffinity_libnuma_save_LIBS"
AS_IF([test "$ompi_check_maffinity_libnuma_happy" = "yes"],
[AS_IF([test ! -z "$with_libnuma"],
[maffinity_libnuma_CPPFLAGS="$maffinity_libnuma_CPPFLAGS -I$with_libnuma/include"
maffinity_libnuma_LDFLAGS="$maffinity_libnuma_LDFLAGS -L$with_libnuma/lib64"
maffinity_libnuma_LIBS="$maffinity_libnuma_LIBS -lnuma"
maffinity_libnuma_WRAPPER_EXTRA_LDFLAGS="$maffinity_libnuma_LDFLAGS"
maffinity_libnuma_WRAPPER_EXTRA_LIBS="$maffinity_libnuma_LIBS"])
$1],
AS_IF([test "$maffinity_libnuma_happy" = "yes"],
[maffinity_libnuma_WRAPPER_EXTRA_LDFLAGS="$maffinity_libnuma_LDFLAGS"
maffinity_libnuma_WRAPPER_EXTRA_LIBS="$maffinity_libnuma_LIBS"
$1],
[$2])
# sanity check
AS_IF([test "$maffinity_libnuma_happy" = "no"],
[AS_IF([test "$with_libnuma" != "no" -a ! -z "$with_libnuma"],
[AC_MSG_ERROR([maffinity:libnuma requested but not found. Aborting])])])
# substitute in the things needed to build gm
AC_SUBST([maffinity_libnuma_CFLAGS])
AC_SUBST([maffinity_libnuma_CPPFLAGS])
AC_SUBST([maffinity_libnuma_LDFLAGS])
AC_SUBST([maffinity_libnuma_LIBS])