[PATCH] tools/libs/guest: fix Makefile regarding zlib options

Juergen Gross posted 1 patch 1 week ago
Failed in applying to current master (apply log)
tools/libs/guest/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

[PATCH] tools/libs/guest: fix Makefile regarding zlib options

Posted by Juergen Gross 1 week ago
When renaming the libxenguest sources to xg_*.c there was an omission
in the Makefile when setting the zlib related define for the related
sources. Fix that.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 tools/libs/guest/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile
index e53aeabd3e..f24732fbcd 100644
--- a/tools/libs/guest/Makefile
+++ b/tools/libs/guest/Makefile
@@ -94,8 +94,8 @@ else
 zlib-options = $(ZLIB)
 endif
 
-xc_dom_bzimageloader.o: CFLAGS += $(filter -D%,$(zlib-options))
-xc_dom_bzimageloader.opic: CFLAGS += $(filter -D%,$(zlib-options))
+xg_dom_bzimageloader.o: CFLAGS += $(filter -D%,$(zlib-options))
+xg_dom_bzimageloader.opic: CFLAGS += $(filter -D%,$(zlib-options))
 
 LIBHEADER := xenguest.h
 
-- 
2.26.2


Re: [PATCH] tools/libs/guest: fix Makefile regarding zlib options

Posted by Wei Liu 5 days ago
On Thu, Sep 10, 2020 at 05:42:10PM +0200, Juergen Gross wrote:
> When renaming the libxenguest sources to xg_*.c there was an omission
> in the Makefile when setting the zlib related define for the related
> sources. Fix that.
> 
> Signed-off-by: Juergen Gross <jgross@suse.com>

Acked-by: Wei Liu <wl@xen.org>

Re: [PATCH] tools/libs/guest: fix Makefile regarding zlib options

Posted by Wei Liu 4 days ago
On Mon, Sep 14, 2020 at 09:39:01AM +0000, Wei Liu wrote:
> On Thu, Sep 10, 2020 at 05:42:10PM +0200, Juergen Gross wrote:
> > When renaming the libxenguest sources to xg_*.c there was an omission
> > in the Makefile when setting the zlib related define for the related
> > sources. Fix that.
> > 
> > Signed-off-by: Juergen Gross <jgross@suse.com>
> 
> Acked-by: Wei Liu <wl@xen.org>

Actually this is already applied. Thanks Andrew.