v4.1.x: two cleanups #10407
Merged
v4.1.x: two cleanups #10407
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
OMPI_CANONICALIZE_PATH broke on MacOS when `/usr/bin/python` disappeared (in favor of `/usr/bin/python3`) in MacOS Monterrey. Make things simpler by not canonicalizing the path to begin with. Specifically: just look at `pwd`, $srcdir, and $prefix. Even if $srcdir and/or $prefix are relative to the build dir, the union of all the checks will ensure that none of the target paths will contain spaces. Signed-off-by: Jeff Squyres <jsquyres@cisco.com> (cherry picked from commit 6992c64)
Unbelievably, at least some versions of jni.h have a global symbol named "jvalue". So avoid using that name as a parameter or variable in our code. Signed-off-by: Jeff Squyres <jsquyres@cisco.com> (cherry picked from commit 5b0ef3e)
jsquyres
force-pushed
the
pr/v4.1.x/misc-cleanups
branch
from
0789987 to
1a10507
Compare
bwbarrett
approved these changes
May 18, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a cherry pick of 2 minor fixes from #10246 (the other commits on that PR were either unrelated to v4.1.x or configure output cleanups that we really shouldn't do so late in the v4.1.x series).