Skip to content

v3.1: config/opal_setup_java.m4: Improve JDK tool path resolution on OS X/… #5118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 14, 2018

Conversation

ggouaillardet
Copy link
Contributor

…macOS.

Also avoid picking up Apple's Java shims via the sym. links to them in
/usr/bin on systems where any one of them could possibly exhibit behavior
that is erratic and, to some extent, likely to be incorrect nowadays (cf.:

for more detailed context.)

Works alongside #5001 to close #5000.

Signed-off-by: Bryce Glover [email protected]

(cherry picked from commit 8c32cd8)

…acOS.

Also avoid picking up Apple's Java shims via the sym. links to them in
`/usr/bin` on systems where any one of them could possibly exhibit behavior
that is erratic and, to some extent, likely to be incorrect nowadays (cf.:

- https://www.mail-archive.com/[email protected]/msg20551.html
- open-mpi#5015 (comment)
- the last part  of
  open-mpi#5015 (comment)
- open-mpi#5015 (comment)

for more detailed context.)

Works alongside open-mpi#5001 to close open-mpi#5000.

Signed-off-by: Bryce Glover <[email protected]>

(cherry picked from commit open-mpi/ompi@8c32cd8)
@RandomDSdevel
Copy link
Contributor

RandomDSdevel commented May 3, 2018

@bwbarrett:

     This PR should be part of v3.1.0, not v3.1.1, if at all possible because the earlier release also includes #5028, which contains a change that goes together with the one backported by this PR, already. (Both this change and that one are needed on all relevant release tracks to resolve #5000. Pending backport PR review, both changes' v3.0.x counterparts should similarly both be part of v3.0.2.)

@bwbarrett
Copy link
Member

@RandomDSdevel, sorry, at this point, 3.1.0 is baked. This patch will make 3.1.1.

@jsquyres
Copy link
Member

jsquyres commented May 4, 2018

@RandomDSdevel 3.1.1 will be a somewhat-quick turnaround (let's estimate a month?).

Copy link
Member

@jsquyres jsquyres left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, but I'd also like to get @kawashima-fj's review.

@jsquyres jsquyres changed the title config/opal_setup_java.m4: Improve JDK tool path resolution on OS X/… v3.1: config/opal_setup_java.m4: Improve JDK tool path resolution on OS X/… May 4, 2018
@jsquyres
Copy link
Member

jsquyres commented May 9, 2018

Per #5001 (comment), do not merge yet.

@jsquyres
Copy link
Member

jsquyres commented May 9, 2018

@ggouaillardet Can you cherry pick 4a05c7e on to this PR?

     That PR accidentally changed Open MPI's build configuration infrastruc-
ture's Java toolchain detection logic so that it would, as reported by @bosilca
in open-mpi#5001 (comment) and tracked down by me in open-mpi#5001 (comment), abort your entire
in-progress Open MPI build when it failed to find an OS X/macOS JDK instead of
simply falling back to checking for a JDK in locations where it would be found
on other platforms.  _Oops…!_

Signed-off-by: Bryce Glover <[email protected]>

(cherry picked from commit open-mpi/ompi@4a05c7e)
@ggouaillardet
Copy link
Contributor Author

@jsquyres done !

@bwbarrett bwbarrett merged commit c99cf1a into open-mpi:v3.1.x May 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants