Attachment 245058 Details for Bug 273961 – patch

[patch] patch

ac2c4bee56.patch (text/plain), 1.08 KB, created by Ivan Rozhuk on 2023-09-20 14:01:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2023-09-20 14:01:41 UTC

Size: 1.08 KB

patch

obsolete

>From ac2c4bee562e3666d68d84851b8f9b98d8ce35f1 Mon Sep 17 00:00:00 2001
>From: Rozhuk Ivan <rozhuk.im@gmail.com>
>Date: Wed, 20 Sep 2023 14:55:04 +0300
>Subject: [PATCH] Fix multiple *ssl lib issues: CMkae, py-cryptography and
> probably other
>
>---
> Mk/Uses/ssl.mk | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk
>index 6b7c09857f34..17c8bb67e53d 100644
>--- a/Mk/Uses/ssl.mk
>+++ b/Mk/Uses/ssl.mk
>@@ -114,6 +114,10 @@ MAKE_ENV+=		OPENSSLBASE=${OPENSSLBASE}
> MAKE_ENV+=		OPENSSLDIR=${OPENSSLDIR}
> MAKE_ENV+=		OPENSSLINC=${OPENSSLINC}
> MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB}
>+MAKE_ENV+=		OPENSSL_DIR="${OPENSSLBASE}"
>+MAKE_ENV+=		OPENSSL_ROOT_DIR=${OPENSSLBASE}
>+CONFIGURE_ENV+=		OPENSSL_DIR=${OPENSSLBASE}
>+CONFIGURE_ENV+=		OPENSSL_ROOT_DIR=${OPENSSLBASE}
> 
> .  if defined(OPENSSLRPATH)
> .    if defined(USE_OPENSSL_RPATH)
>@@ -123,6 +127,7 @@ MAKE_ENV+=		OPENSSLRPATH=${OPENSSLRPATH}
> OPENSSL_LDFLAGS+=	-Wl,-rpath,${OPENSSLRPATH}
> .  endif
> 
>-LDFLAGS+=		${OPENSSL_LDFLAGS}
>+CFLAGS+=		-I${OPENSSLINC}
>+LDFLAGS+=		-L${OPENSSLLIB} ${OPENSSL_LDFLAGS}
> 
> .endif

Actions: View | Diff

Attachments on bug 273961: 245049 | 245058 | 245503 | 245511