From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: bluestop.org, ip: 96.73.9.1, mailfrom: rebecca@bluestop.org) Received: from muon.bluestop.org (muon.bluestop.org [96.73.9.1]) by groups.io with SMTP; Thu, 13 Jun 2019 16:32:54 -0700 Received: from muon.bluestop.org (localhost [127.0.0.1]) by muon.bluestop.org (Postfix) with ESMTP id 71DE56A689; Thu, 13 Jun 2019 17:36:57 -0600 (MDT) Received: from muon.bluestop.org ([127.0.0.1]) by muon.bluestop.org (muon.bluestop.org [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id H_5VX2p-Bh1S; Thu, 13 Jun 2019 17:36:56 -0600 (MDT) Received: from photon.int.bluestop.org (unknown [96.73.9.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by muon.bluestop.org (Postfix) with ESMTPSA; Thu, 13 Jun 2019 17:36:56 -0600 (MDT) From: rebecca@bluestop.org To: Jian Wang , Ting Ye , devel@edk2.groups.io Cc: Rebecca Cran Subject: [PATCH] CryptoPkg: define DSO_NONE in the OpenSSL build Date: Thu, 13 Jun 2019 17:32:39 -0600 Message-Id: <20190613233239.54074-1-rebecca@bluestop.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable This fixes the build on FreeBSD, where DSO_METHOD_openssl is undefined since dso_openssl.c only compiles the function if DSO_NONE is defined. Signed-off-by: Rebecca Cran --- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 2 +- CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Libr= ary/OpensslLib/OpensslLib.inf index 5f36edeeef..fa8cc660be 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -15,7 +15,7 @@ VERSION_STRING =3D 1.0 LIBRARY_CLASS =3D OpensslLib DEFINE OPENSSL_PATH =3D openssl - DEFINE OPENSSL_FLAGS =3D -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRIN= T -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE + DEFINE OPENSSL_FLAGS =3D -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRIN= T -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DDSO_NONE =20 # # VALID_ARCHITECTURES =3D IA32 X64 ARM AARCH64 diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPk= g/Library/OpensslLib/OpensslLibCrypto.inf index de05cac931..680df19a4a 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -15,7 +15,7 @@ VERSION_STRING =3D 1.0 LIBRARY_CLASS =3D OpensslLib DEFINE OPENSSL_PATH =3D openssl - DEFINE OPENSSL_FLAGS =3D -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRIN= T -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE + DEFINE OPENSSL_FLAGS =3D -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRIN= T -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DDSO_NONE =20 # # VALID_ARCHITECTURES =3D IA32 X64 ARM AARCH64 --=20 2.21.0