Skip to content

Commit 60a7c31

Browse files
committed
partial fix for node-gyp configure on ppc64le
1 parent 36f8aac commit 60a7c31

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

binding.gyp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
['uname_m=="s390" or uname_m=="s390x"', {
1313
'target_arch': 's390'
1414
}],
15-
['uname_m=="ppc64" or uname_m=="ppc64le"', {
15+
['uname_m=="ppc64"', {
1616
'target_arch': 'ppc64'
1717
}],
18+
['uname_m=="ppc64le"', {
19+
'target_arch': 'ppc64le'
20+
}],
1821
['OS=="win"', {
1922
'javahome%': '<!(node findJavaHome.js)'
2023
}],

find_java_libdir.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ main () {
2828
else
2929
jre_dir="${java_home}/lib"
3030
fi
31-
32-
local lib_dir
31+
32+
local lib_dir=""
3333
if [[ "${os}" == "linux" && ! "${java_version}" =~ (6|7|8) ]]; then
3434
# no arch on JDK 9+
3535
lib_dir="${jre_dir}/server"
@@ -43,6 +43,8 @@ main () {
4343
if [[ -d ${jre_dir}/s390x/classic ]]; then lib_dir="${jre_dir}"/s390x/classic; else lib_dir="${jre_dir}"/s390/classic; fi
4444
elif [[ "${os}" == "linux" ]] && [[ "${target_arch}" == "ppc64" || "${target_arch}" == "ppc" ]]; then
4545
if [[ -d ${jre_dir}/ppc64/classic ]]; then lib_dir="${jre_dir}"/ppc64/classic; fi
46+
elif [[ "${os}" == "linux" ]] && [[ "${target_arch}" == "ppc64le" || "${target_arch}" == "ppcle" ]]; then
47+
if [[ -d ${jre_dir}/ppc64le/classic ]]; then lib_dir="${jre_dir}"/ppc64le/classic; else lib_dir="${jre_dir}"/ppc64le/server; fi
4648
elif [[ "${os}" == "mac" ]]; then
4749
lib_dir="${jre_dir}/server"
4850
else
@@ -60,10 +62,11 @@ main () {
6062
lib_dir="${jre_dir}/${arch}/server"
6163
fi
6264
fi
65+
6366
if [[ -z "${lib_dir}" ]]; then
6467
error "Can't find lib dir for ${os} ${target_arch}, java home: ${java_home}"
6568
fi
6669
echo "${lib_dir}"
6770
}
6871

69-
main "$@"
72+
main "$@"

0 commit comments

Comments
 (0)