xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] tools/libxl: Fix build of libxl with ./configure --disable-blktap2
@ 2014-08-15 14:32 Andrew Cooper
  2014-09-03 16:29 ` Andrew Cooper
  2014-09-08 11:10 ` Ian Campbell
  0 siblings, 2 replies; 3+ messages in thread
From: Andrew Cooper @ 2014-08-15 14:32 UTC (permalink / raw)
  To: Xen-devel; +Cc: Andrew Cooper, Ian Jackson, Ian Campbell

Autoconf already has appropriate Linux/non-Linux logic for CONFIG_BLKTAP2.

Let LIBXL_BLKTAP inherit directly from CONFIG_BLKTAP2, rather than requiring a
further LIBXL_BLKTAP=n in addition to ./configure --disable-blktap2 to get
libxl to successfully link under Linux.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 tools/Rules.mk |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 5bac700..fa59365 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -55,11 +55,7 @@ CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN)
 LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan
 SHLIB_libxenvchan  = -Wl,-rpath-link=$(XEN_LIBVCHAN)
 
-ifeq ($(CONFIG_Linux),y)
-LIBXL_BLKTAP ?= y
-else
-LIBXL_BLKTAP ?= n
-endif
+LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2)
 
 ifeq ($(LIBXL_BLKTAP),y)
 CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude)
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] tools/libxl: Fix build of libxl with ./configure --disable-blktap2
  2014-08-15 14:32 [PATCH] tools/libxl: Fix build of libxl with ./configure --disable-blktap2 Andrew Cooper
@ 2014-09-03 16:29 ` Andrew Cooper
  2014-09-08 11:10 ` Ian Campbell
  1 sibling, 0 replies; 3+ messages in thread
From: Andrew Cooper @ 2014-09-03 16:29 UTC (permalink / raw)
  To: Xen-devel; +Cc: Ian Jackson, Ian Campbell

On 15/08/14 15:32, Andrew Cooper wrote:
> Autoconf already has appropriate Linux/non-Linux logic for CONFIG_BLKTAP2.
>
> Let LIBXL_BLKTAP inherit directly from CONFIG_BLKTAP2, rather than requiring a
> further LIBXL_BLKTAP=n in addition to ./configure --disable-blktap2 to get
> libxl to successfully link under Linux.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: Ian Campbell <Ian.Campbell@citrix.com>
> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>

Ping?

> ---
>  tools/Rules.mk |    6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/tools/Rules.mk b/tools/Rules.mk
> index 5bac700..fa59365 100644
> --- a/tools/Rules.mk
> +++ b/tools/Rules.mk
> @@ -55,11 +55,7 @@ CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN)
>  LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan
>  SHLIB_libxenvchan  = -Wl,-rpath-link=$(XEN_LIBVCHAN)
>  
> -ifeq ($(CONFIG_Linux),y)
> -LIBXL_BLKTAP ?= y
> -else
> -LIBXL_BLKTAP ?= n
> -endif
> +LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2)
>  
>  ifeq ($(LIBXL_BLKTAP),y)
>  CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] tools/libxl: Fix build of libxl with ./configure --disable-blktap2
  2014-08-15 14:32 [PATCH] tools/libxl: Fix build of libxl with ./configure --disable-blktap2 Andrew Cooper
  2014-09-03 16:29 ` Andrew Cooper
@ 2014-09-08 11:10 ` Ian Campbell
  1 sibling, 0 replies; 3+ messages in thread
From: Ian Campbell @ 2014-09-08 11:10 UTC (permalink / raw)
  To: Andrew Cooper; +Cc: Ian Jackson, Xen-devel

On Fri, 2014-08-15 at 15:32 +0100, Andrew Cooper wrote:
> Autoconf already has appropriate Linux/non-Linux logic for CONFIG_BLKTAP2.
> 
> Let LIBXL_BLKTAP inherit directly from CONFIG_BLKTAP2, rather than requiring a
> further LIBXL_BLKTAP=n in addition to ./configure --disable-blktap2 to get
> libxl to successfully link under Linux.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: Ian Campbell <Ian.Campbell@citrix.com>
> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>

Acked + applied.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-09-08 11:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-15 14:32 [PATCH] tools/libxl: Fix build of libxl with ./configure --disable-blktap2 Andrew Cooper
2014-09-03 16:29 ` Andrew Cooper
2014-09-08 11:10 ` Ian Campbell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).