Refs trac:2952: temporarily turn off hwloc PCI support because it causes a
problem on SuSE 10 (which might be related to Oracle's dual-bitness builds, but we aren't completely sure yet). So just turn it off for now, and bring this over to v1.5. Find a proper fix (that enables pci support properly) for trunk/v1.7 later. This commit was SVN r25769. The following Trac tickets were found above: Ticket 2952 --> https://svn.open-mpi.org/trac/ompi/ticket/2952
Этот коммит содержится в:
родитель
7b9bf6fe41
Коммит
40e23e3979
@ -41,7 +41,7 @@ AC_DEFUN([MCA_opal_hwloc_hwloc131_POST_CONFIG],[
|
|||||||
AC_DEFUN([MCA_opal_hwloc_hwloc131_CONFIG],[
|
AC_DEFUN([MCA_opal_hwloc_hwloc131_CONFIG],[
|
||||||
AC_CONFIG_FILES([opal/mca/hwloc/hwloc131/Makefile])
|
AC_CONFIG_FILES([opal/mca/hwloc/hwloc131/Makefile])
|
||||||
|
|
||||||
OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc131_save_CPPFLAGS opal_hwloc_hwloc131_save_LDFLAGS opal_hwloc_hwloc131_save_LIBS opal_hwloc_hwloc131_save_cairo opal_hwloc_hwloc131_save_xml opal_hwloc_hwloc131_basedir opal_hwloc_hwloc131_file])
|
OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc131_save_CPPFLAGS opal_hwloc_hwloc131_save_LDFLAGS opal_hwloc_hwloc131_save_LIBS opal_hwloc_hwloc131_save_cairo opal_hwloc_hwloc131_save_xml opal_hwloc_hwloc131_basedir opal_hwloc_hwloc131_file opal_hwloc_hwloc131_save_enable_pci])
|
||||||
|
|
||||||
# default to this component not providing support
|
# default to this component not providing support
|
||||||
opal_hwloc_hwloc131_basedir=opal/mca/hwloc/hwloc131
|
opal_hwloc_hwloc131_basedir=opal/mca/hwloc/hwloc131
|
||||||
@ -52,6 +52,13 @@ AC_DEFUN([MCA_opal_hwloc_hwloc131_CONFIG],[
|
|||||||
opal_hwloc_hwloc131_save_LDFLAGS=$LDFLAGS
|
opal_hwloc_hwloc131_save_LDFLAGS=$LDFLAGS
|
||||||
opal_hwloc_hwloc131_save_LIBS=$LIBS
|
opal_hwloc_hwloc131_save_LIBS=$LIBS
|
||||||
|
|
||||||
|
# Disable PCI support for now, until we can get a proper fix
|
||||||
|
# for Oralce's builds on older SuSE machines that only have
|
||||||
|
# libpci.a (and support Oracle's weird dual-bitness build
|
||||||
|
# mojo).
|
||||||
|
opal_hwloc_hwloc131_save_enable_pci=$enable_pci
|
||||||
|
enable_pci=no
|
||||||
|
|
||||||
# Run the hwloc configuration - set the prefix to minimize
|
# Run the hwloc configuration - set the prefix to minimize
|
||||||
# the chance that someone will use the internal symbols
|
# the chance that someone will use the internal symbols
|
||||||
HWLOC_SET_SYMBOL_PREFIX([opal_hwloc131_])
|
HWLOC_SET_SYMBOL_PREFIX([opal_hwloc131_])
|
||||||
@ -87,6 +94,7 @@ AC_DEFUN([MCA_opal_hwloc_hwloc131_CONFIG],[
|
|||||||
AS_IF([test -n "$opal_hwloc_hwloc131_save_xml"],
|
AS_IF([test -n "$opal_hwloc_hwloc131_save_xml"],
|
||||||
[enable_xml=$opal_hwloc_hwloc131_save_xml])
|
[enable_xml=$opal_hwloc_hwloc131_save_xml])
|
||||||
|
|
||||||
|
enable_pci=$opal_hwloc_hwloc131_save_enable_pci
|
||||||
CPPFLAGS=$opal_hwloc_hwloc131_save_CPPFLAGS
|
CPPFLAGS=$opal_hwloc_hwloc131_save_CPPFLAGS
|
||||||
LDFLAGS=$opal_hwloc_hwloc131_save_LDFLAGS
|
LDFLAGS=$opal_hwloc_hwloc131_save_LDFLAGS
|
||||||
LIBS=$opal_hwloc_hwloc131_save_LIBS
|
LIBS=$opal_hwloc_hwloc131_save_LIBS
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user