From 39462fcd99349732ef561cda71c4c633b8ce8246 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 22 May 2024 14:07:08 +0200 Subject: openssl: add Library/OpensslLib/openssl to includes, drop e_os.h hack Adding $(OPENSSL_PATH)/e_os.h to the list of source files had the effect that $(OPENSSL_PATH)/ was added to the list of include directories. With the file being gone in openssl-3.2.x this doesn't work any more. Add the directory to the [Includes.Common.Private] section instead. Signed-off-by: Gerd Hoffmann --- CryptoPkg/CryptoPkg.dec | 1 + CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 - CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf | 1 - CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 1 - CryptoPkg/Library/OpensslLib/OpensslLibFull.inf | 1 - CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf | 1 - 6 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec index e613b6b1ae..dc521c09a8 100644 --- a/CryptoPkg/CryptoPkg.dec +++ b/CryptoPkg/CryptoPkg.dec @@ -22,6 +22,7 @@ [Includes.Common.Private] Private Library/Include + Library/OpensslLib/openssl Library/OpensslLib/openssl/include Library/OpensslLib/openssl/providers/common/include Library/OpensslLib/openssl/providers/implementations/include diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf index d499eb7102..8047e9f76b 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -29,7 +29,6 @@ [Sources] OpensslLibConstructor.c - $(OPENSSL_PATH)/e_os.h $(OPENSSL_PATH)/ms/uplink.h # Autogenerated files list starts here $(OPENSSL_PATH)/crypto/aes/aes_cbc.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf index dd07d0f722..fc537dab8f 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf @@ -33,7 +33,6 @@ [Sources] OpensslLibConstructor.c - $(OPENSSL_PATH)/e_os.h $(OPENSSL_PATH)/ms/uplink.h $(OPENSSL_PATH)/crypto/bn/bn_asm.c # Autogenerated files list starts here diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf index d414988f78..7943d7c681 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -30,7 +30,6 @@ [Sources] OpensslLibConstructor.c - $(OPENSSL_PATH)/e_os.h $(OPENSSL_PATH)/ms/uplink.h # Autogenerated files list starts here $(OPENSSL_PATH)/crypto/aes/aes_cbc.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf index 55c6342904..6733fa8f62 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf @@ -34,7 +34,6 @@ [Sources] OpensslLibConstructor.c - $(OPENSSL_PATH)/e_os.h $(OPENSSL_PATH)/ms/uplink.h # Autogenerated files list starts here $(OPENSSL_PATH)/crypto/aes/aes_cbc.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf index b65ecf1e37..0f8f1c1e1e 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf @@ -38,7 +38,6 @@ [Sources] OpensslLibConstructor.c - $(OPENSSL_PATH)/e_os.h $(OPENSSL_PATH)/ms/uplink.h $(OPENSSL_PATH)/crypto/bn/bn_asm.c # Autogenerated files list starts here -- cgit