skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Linux cross compiling, linking & x86_64 arch standardization.

Browse Source
This commit is contained in:
Maarten Billemont
2019-09-25 22:57:26 -04:00
parent a132e03b88
commit 64536f95c0
6 changed files with 23 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
platform-independent/c/core/Dockerfile.x86_64 → platform-independent/c/core/Dockerfile
View File

9
platform-independent/c/core/Dockerfile.x86
View File

@@ -1,9 +0,0 @@
FROM i386/debian:stable-slim
ENTRYPOINT ["linux32", "--"]
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
RUN mkdir -p /usr/share/man/man1
RUN apt-get update && apt-get install -y default-jdk-headless git-core bash libtool automake autoconf make g++
RUN git clone --depth=3 $(: --shallow-submodules) --recurse-submodules --branch rewrite https://gitlab.com/MasterPassword/MasterPassword.git /mpw
RUN cd /mpw && git log -1 && ./gradlew -i clean build

47
platform-independent/c/core/build.gradle
View File

@@ -16,7 +16,7 @@ artifacts {
components.withType( ComponentWithRuntimeFile ) { components.withType( ComponentWithRuntimeFile ) {
if (optimized) if (optimized)
from runtimeFile, { from runtimeFile, {
into targetMachine.getOperatingSystemFamily().getName() + '/' + targetMachine.getArchitecture().getName() into targetMachine.getOperatingSystemFamily().getName() + '/' + targetMachine.getArchitecture().getName().replace('-', '_')
} }
} }
} }
@@ -54,31 +54,30 @@ library {
} }
} }
components.withType( CppComponent ) { binaries.configureEach( CppBinary ) {
binaries.whenElementFinalized { dependencies {
project.dependencies { def arch = targetMachine.getArchitecture().getName().replace('-', '_')
def system = targetMachine.getOperatingSystemFamily().getName() def system = targetMachine.getOperatingSystemFamily().getName()
// libsodium // libsodium
archive.dependsOn project.tasks.maybeCreate( "build_libsodium-${system}", Exec ).configure { archive.dependsOn project.tasks.maybeCreate( "build_libsodium-${system}", Exec ).configure {
commandLine 'bash', "$rootDir/lib/bin/build_libsodium-${system}" commandLine 'bash', "$rootDir/lib/bin/build_libsodium-${system}"
privateHeaders.from "$rootDir/lib/libsodium/build-${system}~/out/include" privateHeaders.from "$rootDir/lib/libsodium/build-${system}~/out/include"
add( linkLibraries.name, fileTree( "$rootDir/lib/libsodium/build-${system}~/out/lib" ) ) implementation fileTree( "$rootDir/lib/libsodium/build-${system}~/out/lib/${arch}" )
}
clean.dependsOn project.tasks.maybeCreate( "clean_libsodium-${system}", Exec ).configure {
commandLine 'bash', "$rootDir/lib/bin/build_libsodium-${system}", 'clean'
}
// libjson-c
/*archive.dependsOn project.tasks.maybeCreate( "build_libjson-c-${system}", Exec ).configure {
commandLine 'bash', "$rootDir/lib/bin/build_libjson-c-${system}"
privateHeaders.from "$rootDir/lib/libjson-c/build-${system}~/out/include"
add( linkLibraries.name, fileTree( "$rootDir/lib/libjson-c/build-${system}~/out/lib" ) )
}
clean.dependsOn project.tasks.maybeCreate( "clean_libjson-c-${system}", Exec ).configure {
commandLine 'bash', "$rootDir/lib/bin/build_libjson-c-${system}", 'clean'
}*/
} }
clean.dependsOn project.tasks.maybeCreate( "clean_libsodium-${system}", Exec ).configure {
commandLine 'bash', "$rootDir/lib/bin/build_libsodium-${system}", 'clean'
}
// libjson-c
/*archive.dependsOn project.tasks.maybeCreate( "build_libjson-c-${system}", Exec ).configure {
commandLine 'bash', "$rootDir/lib/bin/build_libjson-c-${system}"
privateHeaders.from "$rootDir/lib/libjson-c/build-${system}~/out/include"
add( linkLibraries.name, fileTree( "$rootDir/lib/libjson-c/build-${system}~/out/lib" ) )
}
clean.dependsOn project.tasks.maybeCreate( "clean_libjson-c-${system}", Exec ).configure {
commandLine 'bash', "$rootDir/lib/bin/build_libjson-c-${system}", 'clean'
}*/
} }
} }
} }

BIN
platform-independent/c/core/lib/linux/x86/libmpw.so
View File

Binary file not shown.

BIN
platform-independent/c/core/lib/linux/x86_64/libmpw.so
View File

Binary file not shown.

6
platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java
View File

@@ -201,11 +201,5 @@ public final class Native {
return x86; return x86;
} }
@Override
public String toString() {
return name().replace('_', '-' );
}
} }
} }