* [PATCH EDK2 v1 0/1] BaseTools: Remove dependence of libuuid
@ 2021-08-06 9:06 wenyi,xie
2021-08-06 9:06 ` [PATCH EDK2 v1 1/1] " wenyi,xie
0 siblings, 1 reply; 3+ messages in thread
From: wenyi,xie @ 2021-08-06 9:06 UTC (permalink / raw)
To: devel, bob.c.feng, gaoliming, yuwei.chen; +Cc: songdongkuang, xiewenyi2
Main Changes :
1.remove include uuid.h and link to libuuid. And try to build under linux, the building is sucessful.
Wenyi Xie (1):
BaseTools: Remove dependence of libuuid
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(-)
--
2.20.1.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH EDK2 v1 1/1] BaseTools: Remove dependence of libuuid
2021-08-06 9:06 [PATCH EDK2 v1 0/1] BaseTools: Remove dependence of libuuid wenyi,xie
@ 2021-08-06 9:06 ` wenyi,xie
2021-08-23 0:56 ` [edk2-devel] " Yuwei Chen
0 siblings, 1 reply; 3+ messages in thread
From: wenyi,xie @ 2021-08-06 9:06 UTC (permalink / raw)
To: devel, bob.c.feng, gaoliming, yuwei.chen; +Cc: songdongkuang, xiewenyi2
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [PATCH EDK2 v1 1/1] BaseTools: Remove dependence of libuuid
2021-08-06 9:06 ` [PATCH EDK2 v1 1/1] " wenyi,xie
@ 2021-08-23 0:56 ` Yuwei Chen
0 siblings, 0 replies; 3+ messages in thread
From: Yuwei Chen @ 2021-08-23 0:56 UTC (permalink / raw)
To: devel@edk2.groups.io, xiewenyi2@huawei.com, Feng, Bob C,
gaoliming@byosoft.com.cn
Cc: songdongkuang@huawei.com
Reviewed-by: Yuwei Chen<yuwei.chen@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> wenyi,xie via groups.io
> Sent: Friday, August 6, 2021 5:07 PM
> To: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>;
> gaoliming@byosoft.com.cn; Chen, Christine <yuwei.chen@intel.com>
> Cc: songdongkuang@huawei.com; xiewenyi2@huawei.com
> Subject: [edk2-devel] [PATCH EDK2 v1 1/1] BaseTools: Remove dependence
> of libuuid
>
> 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
>
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-23 0:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-06 9:06 [PATCH EDK2 v1 0/1] BaseTools: Remove dependence of libuuid wenyi,xie
2021-08-06 9:06 ` [PATCH EDK2 v1 1/1] " wenyi,xie
2021-08-23 0:56 ` [edk2-devel] " Yuwei Chen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox