diff --git a/opal/mca/hwloc/hwloc131/configure.m4 b/opal/mca/hwloc/hwloc131/configure.m4 index 818205266b..0aa1f7be9e 100644 --- a/opal/mca/hwloc/hwloc131/configure.m4 +++ b/opal/mca/hwloc/hwloc131/configure.m4 @@ -41,7 +41,7 @@ AC_DEFUN([MCA_opal_hwloc_hwloc131_POST_CONFIG],[ AC_DEFUN([MCA_opal_hwloc_hwloc131_CONFIG],[ 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 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_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 # the chance that someone will use the internal symbols 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"], [enable_xml=$opal_hwloc_hwloc131_save_xml]) + enable_pci=$opal_hwloc_hwloc131_save_enable_pci CPPFLAGS=$opal_hwloc_hwloc131_save_CPPFLAGS LDFLAGS=$opal_hwloc_hwloc131_save_LDFLAGS LIBS=$opal_hwloc_hwloc131_save_LIBS