diff options
| author | Qin Long <qin.long@intel.com> | 2017-03-23 16:14:16 +0800 |
|---|---|---|
| committer | Qin Long <qin.long@intel.com> | 2017-03-29 16:03:41 +0800 |
| commit | 2c86774429f2e544fbed36f3cdd253eac56e34ab (patch) | |
| tree | 66a956b2f1278d8691d9e2e62bf1e3c9b267c504 /CryptoPkg/CryptoPkg.dec | |
| parent | 2ed235fc296b17ead0bebd670aa5bc891cf086cc (diff) | |
| download | edk2-2c86774429f2e544fbed36f3cdd253eac56e34ab.tar.gz edk2-2c86774429f2e544fbed36f3cdd253eac56e34ab.tar.bz2 edk2-2c86774429f2e544fbed36f3cdd253eac56e34ab.zip | |
CryptoPkg/OpensslLib: Update INF files to support OpenSSL-1.1.0x build
Update OpensslLib INF files to support OpenSSL-1.1.0x source build.
The file list was generated from the latest OpenSSL-1.1.0e release.
Main changes to support OpensslLib build in this patch include:
1. Use "openssl" instead of "openssl-x.x.xx" as main source directory,
Also update include path in CryptoPkg.dec
2. Enable warnings in GCC builds;
3. Update Visual Studio build options to silence current possible build
warnings.
4. Move the default opensslconf.h to Include/openssl, and add one dummy
dso_conf.h for native UEFI build.
The OpensslLib module build was validated as
build -t VSXXXX -a XX -p CryptoPkg/CryptoPkg.dsc
-m CryptoPkg/Library/OpensslLib/OpensslLib.inf
(NOTE: The extra build options for ARM/RVCT/XCODE were kept, which expect
further optimizations from community)
Cc: Ting Ye <ting.ye@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gary Lin <glin@suse.com>
Cc: Ronald Cron <ronald.cron@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Qin Long <qin.long@intel.com>
Reviewed-by: Ting Ye <ting.ye@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Gary Lin <glin@suse.com>
Diffstat (limited to 'CryptoPkg/CryptoPkg.dec')
| -rw-r--r-- | CryptoPkg/CryptoPkg.dec | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec index 27c832707a..fdccbf06f7 100644 --- a/CryptoPkg/CryptoPkg.dec +++ b/CryptoPkg/CryptoPkg.dec @@ -9,10 +9,10 @@ # are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
-#
+#
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
+#
##
[Defines]
@@ -24,7 +24,8 @@ [Includes]
Include
- Library/OpensslLib/openssl-1.0.2k/include
+ Library/OpensslLib/openssl/include
+ Library/OpensslLib/openssl/crypto/include
[LibraryClasses]
## @libraryclass Provides basic library functions for cryptographic primitives.
@@ -41,4 +42,3 @@ [UserExtensions.TianoCore."ExtraFiles"]
CryptoPkgExtra.uni
-
|