50e5b0937c
.ompi_ignored to allow other developers to test with it. It is expected that we'll remove the .ompi_ignore here soon, and simultaneously remove the hwloc 1.2.2ompi component. There was one very minor patch added to stock hwloc 1.3.1 in hwloc/config/hwloc.m4: {{{ --- hwloc-1.3.1/config/hwloc.m4 2011-12-14 +++ ompi3/opal/mca/hwloc/hwloc131/hwloc/config/hwloc.m4 @@ -583,6 +583,7 @@ ]) fi AC_SUBST(HWLOC_PCI_LIBS) + HWLOC_LIBS="$HWLOC_LIBS $HWLOC_PCI_LIBS" # If we asked for pci support but couldn't deliver, fail AS_IF([test "$enable_pci" = "yes" -a "$hwloc_pci_happy" = "no"], [AC_MSG_WARN([Specified --enable-pci switch, but could not]) }}} This will be pushed upstream to hwloc. This commit was SVN r25706. |
||
---|---|---|
.. | ||
base | ||
external | ||
hwloc122ompi | ||
hwloc131 | ||
configure.m4 | ||
hwloc.h | ||
Makefile.am | ||
README.txt |
12 Sep 2011 Notes for hwloc component maintainers: 1. There can only be *1* hwloc version component at a time. Specifically: if there are multiple hwlocXYZ components (i.e., different versions of hwloc), then they must all be .ompi_ignore'd except for 1. This is because we currently m4_include all of the underlying hwloc's .m4 files -- if there are multiple hwlocXYZ components, I don't know if m4 will barf at the multiple, conflicting AC_DEFUNs, or whether it'll just do something completely undefined. 1a. As a consequence, if you're adding a new hwloc version component, you'll need to .ompi_ignore all others while you're testing the new one. 2. If someone wants to fix #1 someday, we might be able to do what we do for libevent: OMPI_CONFIG_SUBDIR (instead of slurping in hwloc's .m4 files).