From 3d08314de0494ff8bdc1a7bccc0ecc1730dbdd60 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 16 Jan 2017 11:31:32 +0100
Subject: [PATCH 2/6] Load system library

---
 src/com/sun/jna/Native.java | 97 ++-------------------------------------------
 1 file changed, 4 insertions(+), 93 deletions(-)

diff --git a/src/com/sun/jna/Native.java b/src/com/sun/jna/Native.java
index 91b195f..9ac3815 100644
--- a/src/com/sun/jna/Native.java
+++ b/src/com/sun/jna/Native.java
@@ -829,101 +829,12 @@ public final class Native implements Version {
 
     /**
      * Loads the JNA stub library.
-     * First tries jna.boot.library.path, then the system path, then from the
-     * jar file.
+     * MODIFIED FROM UPSTREAM - we rip out all sorts of gunk here that is
+     * unnecessary when JNA is properly installed with the OS.
      */
     private static void loadNativeDispatchLibrary() {
-        if (!Boolean.getBoolean("jna.nounpack")) {
-            try {
-                removeTemporaryFiles();
-            }
-            catch(IOException e) {
-                System.err.println("JNA Warning: IOException removing temporary files: " + e.getMessage());
-            }
-        }
-
-        String libName = System.getProperty("jna.boot.library.name", "jnidispatch");
-        String bootPath = System.getProperty("jna.boot.library.path");
-        if (bootPath != null) {
-            // String.split not available in 1.4
-            StringTokenizer dirs = new StringTokenizer(bootPath, File.pathSeparator);
-            while (dirs.hasMoreTokens()) {
-                String dir = dirs.nextToken();
-                File file = new File(new File(dir), System.mapLibraryName(libName).replace(".dylib", ".jnilib"));
-                String path = file.getAbsolutePath();
-                if (DEBUG_JNA_LOAD) {
-                    System.out.println("Looking in " + path);
-                }
-                if (file.exists()) {
-                    try {
-                        if (DEBUG_JNA_LOAD) {
-                            System.out.println("Trying " + path);
-                        }
-                        System.setProperty("jnidispatch.path", path);
-                        System.load(path);
-                        jnidispatchPath = path;
-                        if (DEBUG_JNA_LOAD) {
-                            System.out.println("Found jnidispatch at " + path);
-                        }
-                        return;
-                    } catch (UnsatisfiedLinkError ex) {
-                        // Not a problem if already loaded in anoteher class loader
-                        // Unfortunately we can't distinguish the difference...
-                        //System.out.println("File found at " + file + " but not loadable: " + ex.getMessage());
-                    }
-                }
-                if (Platform.isMac()) {
-                    String orig, ext;
-                    if (path.endsWith("dylib")) {
-                        orig = "dylib";
-                        ext = "jnilib";
-                    } else {
-                        orig = "jnilib";
-                        ext = "dylib";
-                    }
-                    path = path.substring(0, path.lastIndexOf(orig)) + ext;
-                    if (DEBUG_JNA_LOAD) {
-                        System.out.println("Looking in " + path);
-                    }
-                    if (new File(path).exists()) {
-                        try {
-                            if (DEBUG_JNA_LOAD) {
-                                System.out.println("Trying " + path);
-                            }
-                            System.setProperty("jnidispatch.path", path);
-                            System.load(path);
-                            jnidispatchPath = path;
-                            if (DEBUG_JNA_LOAD) {
-                                System.out.println("Found jnidispatch at " + path);
-                            }
-                            return;
-                        } catch (UnsatisfiedLinkError ex) {
-                            System.err.println("File found at " + path + " but not loadable: " + ex.getMessage());
-                        }
-                    }
-                }
-            }
-        }
-        if (!Boolean.getBoolean("jna.nosys")) {
-            try {
-                if (DEBUG_JNA_LOAD) {
-                    System.out.println("Trying (via loadLibrary) " + libName);
-                }
-                System.loadLibrary(libName);
-                if (DEBUG_JNA_LOAD) {
-                    System.out.println("Found jnidispatch on system path");
-                }
-                return;
-            }
-            catch(UnsatisfiedLinkError e) {
-            }
-        }
-        if (!Boolean.getBoolean("jna.noclasspath")) {
-            loadNativeDispatchLibraryFromClasspath();
-        }
-        else {
-            throw new UnsatisfiedLinkError("Unable to locate JNA native support library");
-        }
+        jnidispatchPath = "@LIBDIR@/" + System.mapLibraryName("jnidispatch");
+        System.load(jnidispatchPath);
     }
 
     static final String JNA_TMPLIB_PREFIX = "jna";
-- 
2.14.3