From f4fb0faf2c44a173cd89254aea2aaf8250fc1039 Mon Sep 17 00:00:00 2001
From: Hilko Bengen <bengen@hilluzination.de>
Date: Sun, 9 Feb 2025 22:12:33 +0100
Subject: [PATCH] Fix OpenSSL build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Build fewer features. We only need pkcs7 and hash functions
- Make sure library is found by installing into $PREFIX/lib, not
  $PREFIX/lib64 or anything else
- Set LDFLAGS=-L… in yara build (Why wasn't this necessary before?)

Close #80
---
 3rdparty.mk | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/3rdparty.mk b/3rdparty.mk
index 213e25d..74fc0fd 100644
--- a/3rdparty.mk
+++ b/3rdparty.mk
@@ -140,7 +140,8 @@ _3rdparty/build/$1/yara-$(yara_VERSION)/.build-stamp: _3rdparty/src/yara-$(yara_
 		--disable-magic --disable-cuckoo --enable-macho --enable-dex \
 		CC=$$(firstword $$(shell PATH=$$(PATH) which $1-gcc gcc cc)) \
 		CPPFLAGS="-I$(abspath _3rdparty/tgt/$1/include) $(if $(findstring -mingw32,$1),-UHAVE__MKGMTIME)" \
-		CFLAGS="$(if $(findstring -linux-musl,$1),-static)"
+		CFLAGS="$(if $(findstring -linux-musl,$1),-static)" \
+		LDFLAGS="-L$(abspath _3rdparty/tgt/$1/lib)"
 	$(MAKE) -s -C $$(@D) uninstall
 	$(MAKE) -s -j$(3rdparty_JOBS) -C $$(@D)
 	$(MAKE) -s -C $$(@D) install
@@ -164,11 +165,18 @@ _3rdparty/build/$1/openssl-$(openssl_VERSION)/.build-stamp: _3rdparty/src/openss
 	@mkdir -p $$(@D)
 	cd $$(@D) && $$(abspath $$(<D))/config \
 		no-afalgeng \
+		no-apps \
 		no-async \
 		no-capieng \
 		no-dso \
+		no-engine \
+		no-posix-io \
 		no-shared \
 		no-sock \
+		no-ssl \
+		no-tls \
+		no-threads \
+		no-winstore \
 		$(or $(if $(findstring i386-linux-musl,$1),linux-x86),\
 		     $(if $(findstring x86_64-linux-musl,$1),linux-x86_64),\
 		     $(if $(findstring aarch64-linux-musl,$1),linux-aarch64),\
@@ -178,7 +186,8 @@ _3rdparty/build/$1/openssl-$(openssl_VERSION)/.build-stamp: _3rdparty/src/openss
 		-DOPENSSL_NO_SECURE_MEMORY \
 		--prefix=$(abspath _3rdparty/tgt/$1)
 	$(MAKE) -s -j$(3rdparty_JOBS) -C $$(@D)
-	$(MAKE) -s -C $$(@D) install_sw
+	# LIBDIR overrides "multilib" settings
+	$(MAKE) -s -C $$(@D) install_sw LIBDIR=lib
 	touch $$@
 
 endef