[PATCH EDK2 v1 1/1] BaseTools: Remove dependence of libuuid


wenyi,xie
 

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 <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Wenyi Xie <xiewenyi2@huawei.com>
---
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
//

-#if defined(__FreeBSD__)
-#include <uuid.h>
-#elif defined(__GNUC__)
-#include <uuid/uuid.h>
-#endif
#ifdef __GNUC__
#include <sys/stat.h>
#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 += -L/lib/e2fsprogs -luuid
endif

-ifeq ($(LINUX), Linux)
- LIBS += -luuid
-endif
-
diff --git a/BaseTools/Source/C/GenFv/GNUmakefile b/BaseTools/Source/C/GenFv/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 += -L/lib/e2fsprogs -luuid
endif

-ifeq ($(LINUX), Linux)
- LIBS += -luuid
-endif
-
diff --git a/BaseTools/Source/C/GenFw/GNUmakefile b/BaseTools/Source/C/GenFw/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 += -L/lib/e2fsprogs -luuid
endif

-ifeq ($(LINUX), Linux)
- LIBS += -luuid
-endif
-
diff --git a/BaseTools/Source/C/GenSec/GNUmakefile b/BaseTools/Source/C/GenSec/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 += -L/lib/e2fsprogs -luuid
endif

-ifeq ($(LINUX), Linux)
- LIBS += -luuid
-endif
-
--
2.20.1.windows.1

Join devel@edk2.groups.io to automatically receive all group messages.