Skip to content

partial fix for node-gyp configure on ppc64le. Issue #437 #438

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
joeferner merged 1 commit into from
Jun 11, 2018
Merged

partial fix for node-gyp configure on ppc64le. Issue #437 #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@
['uname_m=="s390" or uname_m=="s390x"', {
'target_arch': 's390'
}],
['uname_m=="ppc64" or uname_m=="ppc64le"', {
['uname_m=="ppc64"', {
'target_arch': 'ppc64'
}],
['uname_m=="ppc64le"', {
'target_arch': 'ppc64le'
}],
['OS=="win"', {
'javahome%': '<!(node findJavaHome.js)'
}],
Expand Down
9 changes: 6 additions & 3 deletions find_java_libdir.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ main () {
else
jre_dir="${java_home}/lib"
fi

local lib_dir
local lib_dir=""
if [[ "${os}" == "linux" && ! "${java_version}" =~ (6|7|8) ]]; then
# no arch on JDK 9+
lib_dir="${jre_dir}/server"
Expand All @@ -43,6 +43,8 @@ main () {
if [[ -d ${jre_dir}/s390x/classic ]]; then lib_dir="${jre_dir}"/s390x/classic; else lib_dir="${jre_dir}"/s390/classic; fi
elif [[ "${os}" == "linux" ]] && [[ "${target_arch}" == "ppc64" || "${target_arch}" == "ppc" ]]; then
if [[ -d ${jre_dir}/ppc64/classic ]]; then lib_dir="${jre_dir}"/ppc64/classic; fi
elif [[ "${os}" == "linux" ]] && [[ "${target_arch}" == "ppc64le" || "${target_arch}" == "ppcle" ]]; then
if [[ -d ${jre_dir}/ppc64le/classic ]]; then lib_dir="${jre_dir}"/ppc64le/classic; else lib_dir="${jre_dir}"/ppc64le/server; fi
elif [[ "${os}" == "mac" ]]; then
lib_dir="${jre_dir}/server"
else
Expand All @@ -60,10 +62,11 @@ main () {
lib_dir="${jre_dir}/${arch}/server"
fi
fi

if [[ -z "${lib_dir}" ]]; then
error "Can't find lib dir for ${os} ${target_arch}, java home: ${java_home}"
fi
echo "${lib_dir}"
}

main "$@"
main "$@"