From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com []) by mx.groups.io with SMTP id smtpd.web09.485.1605160579763645521 for ; Wed, 11 Nov 2020 21:56:23 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: zhichao.gao@intel.com) IronPort-SDR: CHdkAarwZOt6PTJQrYUmacI9YU1kHJiVPF+WyDoVu32g04CN0y3ori3ykW/7aZGo/VOAZtHA2X 3RyqlCBqWy/A== X-IronPort-AV: E=McAfee;i="6000,8403,9802"; a="254971184" X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="254971184" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2020 21:56:22 -0800 IronPort-SDR: lHkbXbS6f/th4bBe/HW4XzJccOZpMqCVdN4HCU652ZdjDD6Lax09bg7x1SrsdI+arAXBo/2NJT I8oPSPeLo7Xw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="366490782" Received: from fieedk001.ccr.corp.intel.com ([10.239.153.118]) by orsmga007.jf.intel.com with ESMTP; 11 Nov 2020 21:56:21 -0800 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Maciej Rabeda , Jiaxin Wu , Siyuan Fu Subject: [PATCH V4 04/13] NetworkPkg: Enable MD5 while enable iSCSI Date: Thu, 12 Nov 2020 13:55:49 +0800 Message-Id: <20201112055558.2348-5-zhichao.gao@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20201112055558.2348-1-zhichao.gao@intel.com> References: <20201112055558.2348-1-zhichao.gao@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3003 There is a plan to make MD5 disable as default. The new MACRO ENABLE_MD5_DEPRECATED_INTERFACES would be introduced to enable MD5. Make the definition ahead of the change to avoid build error after the MACRO changed. 1. Add the NetworkBuildOptions.dsc.inc to define the MACRO for build (support: GCC, INTEL, MSFT and RVCT) 2. Add the BuildOption file to Network.dsc.inc Cc: Maciej Rabeda Cc: Jiaxin Wu Cc: Siyuan Fu Signed-off-by: Zhichao Gao --- NetworkPkg/Network.dsc.inc | 5 ++++- NetworkPkg/NetworkBuildOptions.dsc.inc | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 NetworkPkg/NetworkBuildOptions.dsc.inc diff --git a/NetworkPkg/Network.dsc.inc b/NetworkPkg/Network.dsc.inc index 16f090a187..6cd0c005fc 100644 --- a/NetworkPkg/Network.dsc.inc +++ b/NetworkPkg/Network.dsc.inc @@ -7,7 +7,7 @@ # This file defines one build flag PLATFORMX64_ENABLE to support # IA32 PEI and X64 DXE platform. Its default value is FALSE. # -# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent @@ -39,3 +39,6 @@ !include NetworkPkg/NetworkComponents.dsc.inc !endif + +[BuildOptions] +!include NetworkPkg/NetworkBuildOptions.dsc.inc diff --git a/NetworkPkg/NetworkBuildOptions.dsc.inc b/NetworkPkg/NetworkBuildOptions.dsc.inc new file mode 100644 index 0000000000..ce3460d472 --- /dev/null +++ b/NetworkPkg/NetworkBuildOptions.dsc.inc @@ -0,0 +1,22 @@ +## @file +# Network DSC include file for [BuildOptions] sections of all Architectures. +# +# This file can be included in the [BuildOptions*] section(s) of a platform # DSC file +# by using "!include NetworkPkg/NetworkBuildOptions.dsc.inc", to specify the C language +# feature test macros (eg., API deprecation macros) according to the flags described +# in "NetworkDefines.dsc.inc". +# +# Supported tool chain: "GCC:", "INTEL:", "MSFT:", "RVCT". +# +# Copyright (c) 2020, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +!if $(NETWORK_ISCSI_ENABLE) == TRUE + MSFT:*_*_*_CC_FLAGS = /D ENABLE_MD5_DEPRECATED_INTERFACES + INTEL:*_*_*_CC_FLAGS = /D ENABLE_MD5_DEPRECATED_INTERFACES + GCC:*_*_*_CC_FLAGS = -D ENABLE_MD5_DEPRECATED_INTERFACES + RVCT:*_*_*_CC_FLAGS = -DENABLE_MD5_DEPRECATED_INTERFACES +!endif -- 2.21.0.windows.1