Patch honor-without-rpath-hwloc applied upstream

Also contains a typo fixed spotted by upstream developers.