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.

Sign up for GitHub

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
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5c63e7
config/opal_setup_java.m4: Improve JDK tool path resolution on OS X/…
RandomDSdevel Apr 4, 2018
196bb86
config/opal_setup_java.m4: Fix #5015.
RandomDSdevel May 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions config/opal_setup_java.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,29 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
# hard-code a few of the common ones so that users don't have to
# specify --with-java-<foo>=LONG_ANNOYING_DIRECTORY.
AS_IF([test -z "$with_jdk_bindir"],
[ # OS X Snow Leopard and Lion (10.6 and 10.7 -- did not
# check prior versions)
[ # OS X/macOS
opal_java_found=0
# The following logic was deliberately decided upon in https://github.com/open-mpi/ompi/pull/5015 specifically to prevent this script and the
# rest of Open MPI's build system from getting confused by the somewhat unorthodox Java toolchain layout present on OS X/macOS systems, described
# in depth by https://github.com/open-mpi/ompi/pull/5015#issuecomment-379324639, and mishandling OS X/macOS Java toolchain path
# detection as a result.
AS_IF([test -x /usr/libexec/java_home],
[opal_java_dir=`/usr/libexec/java_home`/include],
[opal_java_dir=/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers])
AC_MSG_CHECKING([OSX locations])
[opal_java_dir=`/usr/libexec/java_home`],
[opal_java_dir=/System/Library/Frameworks/JavaVM.framework/Versions/Current])
AC_MSG_CHECKING([OS X/macOS locations])
AS_IF([test -d $opal_java_dir],
[AC_MSG_RESULT([found ($opal_java_dir)])
opal_java_found=1
with_jdk_headers=$opal_java_dir
with_jdk_bindir=/usr/bin],
if test -d "$opal_java_dir/Headers" && test -d "$opal_java_dir/Commands"; then
with_jdk_headers=$opal_java_dir/Headers
with_jdk_bindir=$opal_java_dir/Commands
elif test -d "$opal_java_dir/include" && test -d "$opal_java_dir/bin"; then
with_jdk_headers=$opal_java_dir/include
with_jdk_bindir=$opal_java_dir/bin
else
AC_MSG_WARN([No recognized OS X/macOS JDK directory structure found under $opal_java_dir])
opal_java_found=0
fi],
[AC_MSG_RESULT([not found])])

if test "$opal_java_found" = "0"; then
Expand Down