This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-j2r. See https://gitlab.nuiton.org/nuiton/nuiton-j2r.git commit db7775f0b575692144e2b1a7683942c7b779ca7c Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Jan 4 10:16:25 2017 +0100 fixes #4124: Fix x86 arch detection --- src/main/java/org/nuiton/j2r/jni/RNative.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/nuiton/j2r/jni/RNative.java b/src/main/java/org/nuiton/j2r/jni/RNative.java index 3698629..594542d 100644 --- a/src/main/java/org/nuiton/j2r/jni/RNative.java +++ b/src/main/java/org/nuiton/j2r/jni/RNative.java @@ -62,16 +62,14 @@ public class RNative { * type/arch/name. * * @param arch from <code>os.arch</code> System property - * @param name from <code>os.name</code> System property */ static String getNativeLibraryResourcePrefix(String arch) { String osPrefix; arch = arch.toLowerCase().trim(); - if ("i386".equals(arch)) { - arch = "x86"; - } - else if ("x86_64".equals(arch) || "amd64".equals(arch)) { + if ("x86_64".equals(arch) || "amd64".equals(arch)) { arch = "x86-64"; + } else { + arch = "x86"; } if (IS_WINDOWS) { @@ -79,7 +77,7 @@ public class RNative { } else if (IS_LINUX) { osPrefix = "linux-" + arch; } else { - throw new UnsatisfiedLinkError("Unsupported plaform/arch"); + throw new UnsatisfiedLinkError("Unsupported platform/arch"); } return osPrefix; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.