Skip to content

Added support for aarch64 and ppc64le binaries #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
judovana wants to merge 5 commits into from
Closed

Added support for aarch64 and ppc64le binaries #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b9cce08
Added usage of aarch64 build of native llmdb
judovana Aug 13, 2020
e4b6569
Added usage of ppc64le build of native llmdb
judovana Aug 15, 2020
551fd7f
Added more distinguished names for x86_64, aarch64, ppc64le and unif…
judovana Aug 17, 2020
a0e562f
Renamed unifying x86_64 varable to make spotbugs happy
judovana Aug 17, 2020
72fde46
Commented out really unused arch64 variable
judovana Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,18 @@
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
</dependency>
<dependency>
<groupId>org.lmdbjava</groupId>
<artifactId>lmdbjava-native-linux-aarch64</artifactId>
<version>0.9.24-2-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.lmdbjava</groupId>
<artifactId>lmdbjava-native-linux-ppc64le</artifactId>
<version>0.9.24-2-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.lmdbjava</groupId>
<artifactId>lmdbjava-native-linux-x86_64</artifactId>
Expand Down Expand Up @@ -112,6 +124,8 @@
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<usedDependencies>
<usedDependency>org.lmdbjava:lmdbjava-native-linux-ppc64le</usedDependency>
<usedDependency>org.lmdbjava:lmdbjava-native-linux-aarch64</usedDependency>
<usedDependency>org.lmdbjava:lmdbjava-native-linux-x86_64</usedDependency>
<usedDependency>org.lmdbjava:lmdbjava-native-windows-x86_64</usedDependency>
<usedDependency>org.lmdbjava:lmdbjava-native-osx-x86_64</usedDependency>
Expand Down Expand Up @@ -142,6 +156,8 @@
<configuration>
<artifactSet>
<includes>
<include>org.lmdbjava:lmdbjava-native-linux-ppc64le</include>
<include>org.lmdbjava:lmdbjava-native-linux-aarch64</include>
<include>org.lmdbjava:lmdbjava-native-linux-x86_64</include>
<include>org.lmdbjava:lmdbjava-native-windows-x86_64</include>
<include>org.lmdbjava:lmdbjava-native-osx-x86_64</include>
Expand Down
16 changes: 12 additions & 4 deletions src/main/java/org/lmdbjava/Library.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,12 @@ final class Library {
final String libToLoad;

final String arch = getProperty("os.arch");
final boolean arch64 = "x64".equals(arch) || "amd64".equals(arch)
final boolean x64 = "x64".equals(arch) || "amd64".equals(arch)
|| "x86_64".equals(arch);
final boolean aarch64 = "aarch64".equals(arch);
final boolean ppc64le = "ppc64le".equals(arch);

// final boolean arch64 = x64 || aarch64 || ppc64le;

final String os = getProperty("os.name");
final boolean linux = os.toLowerCase(ENGLISH).startsWith("linux");
Expand All @@ -112,11 +116,15 @@ final class Library {

if (SHOULD_USE_LIB) {
libToLoad = getProperty(LMDB_NATIVE_LIB_PROP);
} else if (SHOULD_EXTRACT && arch64 && linux) {
} else if (SHOULD_EXTRACT && aarch64 && linux) {
libToLoad = extract("org/lmdbjava/lmdbjava-native-linux-aarch64.so");
} else if (SHOULD_EXTRACT && ppc64le && linux) {
libToLoad = extract("org/lmdbjava/lmdbjava-native-linux-ppc64le.so");
} else if (SHOULD_EXTRACT && x64 && linux) {
libToLoad = extract("org/lmdbjava/lmdbjava-native-linux-x86_64.so");
} else if (SHOULD_EXTRACT && arch64 && osx) {
} else if (SHOULD_EXTRACT && x64 && osx) {
libToLoad = extract("org/lmdbjava/lmdbjava-native-osx-x86_64.dylib");
} else if (SHOULD_EXTRACT && arch64 && windows) {
} else if (SHOULD_EXTRACT && x64 && windows) {
libToLoad = extract("org/lmdbjava/lmdbjava-native-windows-x86_64.dll");
} else {
libToLoad = LIB_NAME;
Expand Down