Date: Sat, 5 Oct 2013 11:34:59 +0000 (UTC) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329442 - in head/devel/jna: . files Message-ID: <201310051134.r95BYx4C041845@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olgeni Date: Sat Oct 5 11:34:59 2013 New Revision: 329442 URL: http://svnweb.freebsd.org/changeset/ports/329442 Log: Fix loading of libc.so after r251668 ("turn libc.so into an ld script.") Submitted by: jkim Added: head/devel/jna/files/patch-src__com__sun__jna__NativeLibrary.java (contents, props changed) Modified: head/devel/jna/Makefile Modified: head/devel/jna/Makefile ============================================================================== --- head/devel/jna/Makefile Sat Oct 5 11:28:42 2013 (r329441) +++ head/devel/jna/Makefile Sat Oct 5 11:34:59 2013 (r329442) @@ -2,6 +2,7 @@ PORTNAME= jna PORTVERSION= 4.0 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= GH Added: head/devel/jna/files/patch-src__com__sun__jna__NativeLibrary.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/jna/files/patch-src__com__sun__jna__NativeLibrary.java Sat Oct 5 11:34:59 2013 (r329442) @@ -0,0 +1,29 @@ +--- src/com/sun/jna/NativeLibrary.java.orig 2013-07-04 14:42:30.000000000 -0400 ++++ src/com/sun/jna/NativeLibrary.java 2013-10-04 17:28:07.000000000 -0400 +@@ -203,7 +203,7 @@ + } + catch(UnsatisfiedLinkError e2) { e = e2; } + } +- else if (Platform.isLinux()) { ++ else if (Platform.isLinux() || Platform.isFreeBSD()) { + // + // Failed to load the library normally - try to match libfoo.so.* + // +@@ -382,7 +382,7 @@ + + // Use current process to load libraries we know are already + // loaded by the VM to ensure we get the correct version +- if ((Platform.isLinux() || Platform.isAIX()) ++ if ((Platform.isLinux() || Platform.isFreeBSD() || Platform.isAIX()) + && Platform.C_LIBRARY_NAME.equals(libraryName)) { + libraryName = null; + } +@@ -702,7 +702,7 @@ + } + return name; + } +- else if (Platform.isLinux()) { ++ else if (Platform.isLinux() || Platform.isFreeBSD()) { + if (isVersionedName(libName) || libName.endsWith(".so")) { + // A specific version was requested - use as is for search + return libName;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310051134.r95BYx4C041845>