diff options
| author | quapka | 2024-07-24 17:13:07 +0200 |
|---|---|---|
| committer | quapka | 2024-07-24 17:13:07 +0200 |
| commit | d798fffc674fe8d84c26f14ce935611f8afefb6c (patch) | |
| tree | 245aa08f8ea15856a82c67d0a372435cd6dfeb23 | |
| parent | eed2fbf135dace7d911aa042e3d79fa27cbe3d52 (diff) | |
| download | ECTester-d798fffc674fe8d84c26f14ce935611f8afefb6c.tar.gz ECTester-d798fffc674fe8d84c26f14ce935611f8afefb6c.tar.zst ECTester-d798fffc674fe8d84c26f14ce935611f8afefb6c.zip | |
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -63,6 +63,9 @@ libgpg-error = pkgs.libgpg-error.overrideAttrs (final: prev: { configureFlags = ( prev.configureFlags or [] ) ++ [ "--enable-static" ]; }); + libtomcrypt = pkgs.libtomcrypt.overrideAttrs (final: prev: { + makefile = "makefile"; + }); libressl = pkgs.libressl.overrideAttrs (_old: rec { # devLibPath = pkgs.lib.makeLibraryPath [ pkgs.libressl.dev ]; # pname = "libressl"; @@ -122,7 +125,7 @@ # gradleBuildFlags = [ "standalone:uberJar" ]; # ":standalone:compileJava" ":standalone:uberJar" ]; "--no-build-cache" lockFile = ./gradle.lock; # FIXME all libs need to be built, but combining Gradle build all-libs and dedicated shim derivations won't work - gradleBuildFlags = [ "libs" "-PlibName=gcrypt" ":standalone:uberJar"]; # ":standalone:compileJava" ":standalone:uberJar" ]; "--no-build-cache" + gradleBuildFlags = [ "libs" "-PlibName=tomcrypt" ":standalone:uberJar"]; # ":standalone:compileJava" ":standalone:uberJar" ]; "--no-build-cache" src = ./.; preConfigure = '' diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile index 3acff8b..aee0a5e 100644 --- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile +++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile @@ -117,7 +117,7 @@ gcrypt.o: gcrypt.c tomcrypt: tomcrypt_provider.so tomcrypt_provider.so: tomcrypt.o c_utils.o | lib_timing.so lib_csignals.so - $(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -ltommath $(shell pkg-config --libs libtomcrypt) -l:lib_timing.so -l:lib_csignals.so + $(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -ltommath -Wl,-Bstatic $(shell pkg-config --libs libtomcrypt) -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so tomcrypt.o: tomcrypt.c $(CC) -DLTM_DESC $(shell pkg-config --cflags libtomcrypt) $(CFLAGS) -c $< |