From 562263257560b06a0759972744ddbfbaa5bc81f8 Mon Sep 17 00:00:00 2001
From: quapka
Date: Thu, 18 Jul 2024 13:43:15 +0200
Subject: Don't build LibreSSL from submodule

---
 .../java/cz/crcs/ectester/standalone/libs/LibresslLib.java    |  2 +-
 .../resources/cz/crcs/ectester/standalone/libs/jni/Makefile   | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'standalone')

diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java
index 2dba049..a403896 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java
@@ -8,7 +8,7 @@ import java.util.Set;
  */
 public class LibresslLib extends NativeECLibrary {
     public LibresslLib() {
-        super("LibreSSL", "libressl_provider", "lib_libressl.so");
+        super("LibreSSL", "libressl_provider");
     }
 
     @Override
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 6282574..0fc0ca6 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
@@ -189,15 +189,14 @@ nettle.o: nettle.c
 # LibreSSL shim
 libressl: libressl_provider.so
 
-lib_libressl.so:
-	cp $(PROJECT_ROOT_PATH)/ext/libressl/build/crypto/libcrypto.so lib_libressl.so
+# lib_libressl.so:
+# 	cp $(PROJECT_ROOT_PATH)/ext/libressl/build/crypto/libcrypto.so lib_libressl.so
 
-libressl_provider.so: libressl.o c_utils.o | lib_timing.so lib_csignals.so lib_libressl.so
-	$(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. lib_libressl.so -l:lib_timing.so -l:lib_csignals.so
+libressl_provider.so: libressl.o c_utils.o | lib_timing.so lib_csignals.so
+	$(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. $(shell pkg-config --libs libresslcrypto) -l:lib_timing.so -l:lib_csignals.so
 
 libressl.o: libressl.c
-	$(CC) -I$(PROJECT_ROOT_PATH)/ext/libressl/build/include/ $(CFLAGS) -c $<
-
+	$(CC) $(shell pkg-config --cflags libresslcrypto) $(CFLAGS) -c $<
 
 help:
 	@echo "# This makefile builds the JNI shims necessary to test native libraries."
-- 
cgit v1.2.3-70-g09d2