mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00
Code Issues Releases Activity

Fix loading of libc.so after r251668 ("turn libc.so into an ld script.")

Browse Source 
Submitted by:	jkim
This commit is contained in:
Jimmy Olgeni 2013-10-05 11:34:59 +00:00
parent 091e287d11
commit ffd7b654d6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=329442
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devel/jna/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= jna
PORTVERSION= 4.0
PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= GH

29
devel/jna/files/patch-src__com__sun__jna__NativeLibrary.java Normal file
View File

@ -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;