From nobody Thu May 2 19:26:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+78795+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+78795+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1628241090; cv=none; d=zohomail.com; s=zohoarc; b=RtOdZc3izkv9Kt1/ZWXMqcOGrjYKC79fmlz3hDUfbKr5QwopAKQdrbbb39i8+P7NCgoh650TkWqFbU7Pupe9dKkG9rKnu20aSolj7JpZCIX2W8lt6mOqGrUFrOgJirmyz1V3WukTx3U8jcf/pMObfZMI2zTPsKRI/MC6cPyMEas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628241090; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=2fiY+n/Yx1io+lHaz+u+4s7Q58pOL4+OKdg1ym06Xm4=; b=JOXQKXQefkFDcYzYOl+jtXGJyEkBwi0mbBZ+XN+dXmgZi8mm7mMm/z9WsKAWWOylEogCwYNj9Gm6Wy3bAxk2VqabJ2FQhoqkG1Iq5d8IuE3jTVvJ8wJ9ceml+O60ayPb5zaNePY/sYJujHN7lmfSW//sqJpMhNNNq4UQ3GT0FIY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+78795+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1628241090564554.4206816244821; Fri, 6 Aug 2021 02:11:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id OMKWYY1788612xl3c8tJVriQ; Fri, 06 Aug 2021 02:11:29 -0700 X-Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mx.groups.io with SMTP id smtpd.web08.2575.1628241087296982182 for ; Fri, 06 Aug 2021 02:11:28 -0700 X-Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Gh08N5jwCzYlkr; Fri, 6 Aug 2021 17:11:16 +0800 (CST) X-Received: from dggpemm000003.china.huawei.com (7.185.36.128) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 6 Aug 2021 17:11:24 +0800 X-Received: from HGH1000039998.huawei.com (10.184.68.188) by dggpemm000003.china.huawei.com (7.185.36.128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 6 Aug 2021 17:11:23 +0800 From: "wenyi,xie via groups.io" To: , , , CC: , Subject: [edk2-devel] [PATCH EDK2 v1 1/1] BaseTools: Remove dependence of libuuid Date: Fri, 6 Aug 2021 17:06:35 +0800 Message-ID: <1628240795-130638-2-git-send-email-xiewenyi2@huawei.com> In-Reply-To: <1628240795-130638-1-git-send-email-xiewenyi2@huawei.com> References: <1628240795-130638-1-git-send-email-xiewenyi2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.184.68.188] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm000003.china.huawei.com (7.185.36.128) X-CFilter-Loop: Reflected Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,xiewenyi2@huawei.com X-Gm-Message-State: YtMmHXuOnAP3gcw5H3ZI7MmOx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1628241089; bh=u0yscGBqDhrTsHSPWpc/RbANXTMZSwJ1PdN8WbwvWkw=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=cXiyMYEf9btpVdXZIAwqLwXpFt0qxwB+VBvGcQk/wOtnoVYI+XDi1JQIEnHlH2aB+Xc EDxqMkFUJm2Lwn2RHkCwZPQGq8JEkFTR3QovdzZi9LaEBTiqShyGRLrASQZE+b4SY4JvG KpdJUF0HcLqrKKATLrz6Vh53/vIJfS/XvuY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628241091563100005 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The uuid.h only included in file GenFvInternalLib.c, but no interface from libuuid is used in this file. So remove this include and link to libuuid. Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Signed-off-by: Wenyi Xie Reviewed-by: Yuwei Chen --- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 5 ----- BaseTools/Source/C/DevicePath/GNUmakefile | 4 ---- BaseTools/Source/C/GenFv/GNUmakefile | 4 ---- BaseTools/Source/C/GenFw/GNUmakefile | 4 ---- BaseTools/Source/C/GenSec/GNUmakefile | 4 ---- 5 files changed, 21 deletions(-) diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source= /C/GenFv/GenFvInternalLib.c index 6e296b8ad6b2..80bab7fb1381 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c @@ -13,11 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // Include files // =20 -#if defined(__FreeBSD__) -#include -#elif defined(__GNUC__) -#include -#endif #ifdef __GNUC__ #include #endif diff --git a/BaseTools/Source/C/DevicePath/GNUmakefile b/BaseTools/Source/C= /DevicePath/GNUmakefile index 7ca08af9662d..1271555df8d5 100644 --- a/BaseTools/Source/C/DevicePath/GNUmakefile +++ b/BaseTools/Source/C/DevicePath/GNUmakefile @@ -18,7 +18,3 @@ ifeq ($(CYGWIN), CYGWIN) LIBS +=3D -L/lib/e2fsprogs -luuid endif =20 -ifeq ($(LINUX), Linux) - LIBS +=3D -luuid -endif - diff --git a/BaseTools/Source/C/GenFv/GNUmakefile b/BaseTools/Source/C/GenF= v/GNUmakefile index 7c7b95ba1be2..fd8f16903ade 100644 --- a/BaseTools/Source/C/GenFv/GNUmakefile +++ b/BaseTools/Source/C/GenFv/GNUmakefile @@ -17,7 +17,3 @@ ifeq ($(CYGWIN), CYGWIN) LIBS +=3D -L/lib/e2fsprogs -luuid endif =20 -ifeq ($(LINUX), Linux) - LIBS +=3D -luuid -endif - diff --git a/BaseTools/Source/C/GenFw/GNUmakefile b/BaseTools/Source/C/GenF= w/GNUmakefile index 76cda7e7a3f6..3b9a781b5cf6 100644 --- a/BaseTools/Source/C/GenFw/GNUmakefile +++ b/BaseTools/Source/C/GenFw/GNUmakefile @@ -17,7 +17,3 @@ ifeq ($(CYGWIN), CYGWIN) LIBS +=3D -L/lib/e2fsprogs -luuid endif =20 -ifeq ($(LINUX), Linux) - LIBS +=3D -luuid -endif - diff --git a/BaseTools/Source/C/GenSec/GNUmakefile b/BaseTools/Source/C/Gen= Sec/GNUmakefile index 9f0844c1b8fe..c2f440f21ebf 100644 --- a/BaseTools/Source/C/GenSec/GNUmakefile +++ b/BaseTools/Source/C/GenSec/GNUmakefile @@ -17,7 +17,3 @@ ifeq ($(CYGWIN), CYGWIN) LIBS +=3D -L/lib/e2fsprogs -luuid endif =20 -ifeq ($(LINUX), Linux) - LIBS +=3D -luuid -endif - --=20 2.20.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#78795): https://edk2.groups.io/g/devel/message/78795 Mute This Topic: https://groups.io/mt/84704386/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-