* [PATCH for-xen-4.5] tools/ocaml: use APPEND_CFLAGS and APPEND_LDFLAGS
@ 2014-10-06 13:22 Olaf Hering
2014-10-07 12:17 ` Dave Scott
0 siblings, 1 reply; 4+ messages in thread
From: Olaf Hering @ 2014-10-06 13:22 UTC (permalink / raw)
To: xen-devel
Cc: Olaf Hering, Wei Liu, David Scott, Stefano Stabellini,
Ian Jackson, Ian Campbell
While implementing the --enable-rpath change I noticed that a ocaml
build does not use APPEND_LDFLAGS. Make use of APPEND_CFLAGS and
APPEND_LDFLAGS as it is done already in other places.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: David Scott <dave.scott@eu.citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
tools/ocaml/libs/xb/Makefile | 1 +
tools/ocaml/libs/xc/Makefile | 1 +
tools/ocaml/libs/xentoollog/Makefile | 1 +
tools/ocaml/libs/xl/Makefile | 1 +
tools/ocaml/test/Makefile | 1 +
tools/ocaml/xenstored/Makefile | 2 ++
6 files changed, 7 insertions(+)
diff --git a/tools/ocaml/libs/xb/Makefile b/tools/ocaml/libs/xb/Makefile
index 62ffefb..09d1bc8 100644
--- a/tools/ocaml/libs/xb/Makefile
+++ b/tools/ocaml/libs/xb/Makefile
@@ -5,6 +5,7 @@ include $(TOPLEVEL)/common.make
CFLAGS += -I../mmap
CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb()
CFLAGS += $(CFLAGS_xeninclude)
+CFLAGS += $(APPEND_CFLAGS)
OCAMLINCLUDE += -I ../mmap
OCAMLOPTFLAGS += -for-pack Xenbus
diff --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile
index 239c187..d24b014 100644
--- a/tools/ocaml/libs/xc/Makefile
+++ b/tools/ocaml/libs/xc/Makefile
@@ -3,6 +3,7 @@ XEN_ROOT=$(TOPLEVEL)/../..
include $(TOPLEVEL)/common.make
CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
+CFLAGS += $(APPEND_CFLAGS)
OCAMLINCLUDE += -I ../mmap
OBJS = xenctrl
diff --git a/tools/ocaml/libs/xentoollog/Makefile b/tools/ocaml/libs/xentoollog/Makefile
index f2134b8..666eb66 100644
--- a/tools/ocaml/libs/xentoollog/Makefile
+++ b/tools/ocaml/libs/xentoollog/Makefile
@@ -6,6 +6,7 @@ include $(TOPLEVEL)/common.make
CFLAGS += -Wno-declaration-after-statement
CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
+CFLAGS += $(APPEND_CFLAGS)
OCAMLINCLUDE +=
OBJS = xentoollog
diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile
index 61eb44c..0d1549d 100644
--- a/tools/ocaml/libs/xl/Makefile
+++ b/tools/ocaml/libs/xl/Makefile
@@ -7,6 +7,7 @@ CFLAGS += -Wno-unused -Wno-declaration-after-statement
CFLAGS += $(CFLAGS_libxenlight)
CFLAGS += -I ../xentoollog
+CFLAGS += $(APPEND_CFLAGS)
OBJS = xenlight
INTF = xenlight.cmi
diff --git a/tools/ocaml/test/Makefile b/tools/ocaml/test/Makefile
index 8033089..b75726f 100644
--- a/tools/ocaml/test/Makefile
+++ b/tools/ocaml/test/Makefile
@@ -3,6 +3,7 @@ OCAML_TOPLEVEL = $(CURDIR)/..
include $(OCAML_TOPLEVEL)/common.make
CFLAGS += $(CFLAGS_libxenlight)
+CFLAGS += $(APPEND_CFLAGS)
LIBS_xenlight = $(LDLIBS_libxenlight)
OCAMLINCLUDE += \
diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile
index 068e04a..ec19709 100644
--- a/tools/ocaml/xenstored/Makefile
+++ b/tools/ocaml/xenstored/Makefile
@@ -7,7 +7,9 @@ CFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_CFLAGS)
LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
CFLAGS += $(CFLAGS-y)
+CFLAGS += $(APPEND_CFLAGS)
LDFLAGS += $(LDFLAGS-y)
+LDFLAGS += $(APPEND_LDFLAGS)
OCAMLINCLUDE += \
-I $(OCAML_TOPLEVEL)/libs/xb \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH for-xen-4.5] tools/ocaml: use APPEND_CFLAGS and APPEND_LDFLAGS
2014-10-06 13:22 [PATCH for-xen-4.5] tools/ocaml: use APPEND_CFLAGS and APPEND_LDFLAGS Olaf Hering
@ 2014-10-07 12:17 ` Dave Scott
2014-10-07 14:47 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 4+ messages in thread
From: Dave Scott @ 2014-10-07 12:17 UTC (permalink / raw)
To: Olaf Hering
Cc: Dave Scott, Wei Liu, Ian Campbell, xen-devel@lists.xen.org,
Stefano Stabellini, Ian Jackson
Looks good to me.
Acked-by: David Scott <dave.scott@citrix.com>
On 6 Oct 2014, at 14:22, Olaf Hering <olaf@aepfle.de> wrote:
> While implementing the --enable-rpath change I noticed that a ocaml
> build does not use APPEND_LDFLAGS. Make use of APPEND_CFLAGS and
> APPEND_LDFLAGS as it is done already in other places.
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> Cc: David Scott <dave.scott@eu.citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> ---
> tools/ocaml/libs/xb/Makefile | 1 +
> tools/ocaml/libs/xc/Makefile | 1 +
> tools/ocaml/libs/xentoollog/Makefile | 1 +
> tools/ocaml/libs/xl/Makefile | 1 +
> tools/ocaml/test/Makefile | 1 +
> tools/ocaml/xenstored/Makefile | 2 ++
> 6 files changed, 7 insertions(+)
>
> diff --git a/tools/ocaml/libs/xb/Makefile b/tools/ocaml/libs/xb/Makefile
> index 62ffefb..09d1bc8 100644
> --- a/tools/ocaml/libs/xb/Makefile
> +++ b/tools/ocaml/libs/xb/Makefile
> @@ -5,6 +5,7 @@ include $(TOPLEVEL)/common.make
> CFLAGS += -I../mmap
> CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb()
> CFLAGS += $(CFLAGS_xeninclude)
> +CFLAGS += $(APPEND_CFLAGS)
> OCAMLINCLUDE += -I ../mmap
> OCAMLOPTFLAGS += -for-pack Xenbus
>
> diff --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile
> index 239c187..d24b014 100644
> --- a/tools/ocaml/libs/xc/Makefile
> +++ b/tools/ocaml/libs/xc/Makefile
> @@ -3,6 +3,7 @@ XEN_ROOT=$(TOPLEVEL)/../..
> include $(TOPLEVEL)/common.make
>
> CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
> +CFLAGS += $(APPEND_CFLAGS)
> OCAMLINCLUDE += -I ../mmap
>
> OBJS = xenctrl
> diff --git a/tools/ocaml/libs/xentoollog/Makefile b/tools/ocaml/libs/xentoollog/Makefile
> index f2134b8..666eb66 100644
> --- a/tools/ocaml/libs/xentoollog/Makefile
> +++ b/tools/ocaml/libs/xentoollog/Makefile
> @@ -6,6 +6,7 @@ include $(TOPLEVEL)/common.make
> CFLAGS += -Wno-declaration-after-statement
>
> CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
> +CFLAGS += $(APPEND_CFLAGS)
> OCAMLINCLUDE +=
>
> OBJS = xentoollog
> diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile
> index 61eb44c..0d1549d 100644
> --- a/tools/ocaml/libs/xl/Makefile
> +++ b/tools/ocaml/libs/xl/Makefile
> @@ -7,6 +7,7 @@ CFLAGS += -Wno-unused -Wno-declaration-after-statement
>
> CFLAGS += $(CFLAGS_libxenlight)
> CFLAGS += -I ../xentoollog
> +CFLAGS += $(APPEND_CFLAGS)
>
> OBJS = xenlight
> INTF = xenlight.cmi
> diff --git a/tools/ocaml/test/Makefile b/tools/ocaml/test/Makefile
> index 8033089..b75726f 100644
> --- a/tools/ocaml/test/Makefile
> +++ b/tools/ocaml/test/Makefile
> @@ -3,6 +3,7 @@ OCAML_TOPLEVEL = $(CURDIR)/..
> include $(OCAML_TOPLEVEL)/common.make
>
> CFLAGS += $(CFLAGS_libxenlight)
> +CFLAGS += $(APPEND_CFLAGS)
> LIBS_xenlight = $(LDLIBS_libxenlight)
>
> OCAMLINCLUDE += \
> diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile
> index 068e04a..ec19709 100644
> --- a/tools/ocaml/xenstored/Makefile
> +++ b/tools/ocaml/xenstored/Makefile
> @@ -7,7 +7,9 @@ CFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_CFLAGS)
> LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
>
> CFLAGS += $(CFLAGS-y)
> +CFLAGS += $(APPEND_CFLAGS)
> LDFLAGS += $(LDFLAGS-y)
> +LDFLAGS += $(APPEND_LDFLAGS)
>
> OCAMLINCLUDE += \
> -I $(OCAML_TOPLEVEL)/libs/xb \
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH for-xen-4.5] tools/ocaml: use APPEND_CFLAGS and APPEND_LDFLAGS
2014-10-07 12:17 ` Dave Scott
@ 2014-10-07 14:47 ` Konrad Rzeszutek Wilk
2014-10-08 12:55 ` Ian Campbell
0 siblings, 1 reply; 4+ messages in thread
From: Konrad Rzeszutek Wilk @ 2014-10-07 14:47 UTC (permalink / raw)
To: Dave Scott
Cc: Olaf Hering, Wei Liu, Ian Campbell, xen-devel@lists.xen.org,
Stefano Stabellini, Ian Jackson
On Tue, Oct 07, 2014 at 12:17:03PM +0000, Dave Scott wrote:
> Looks good to me.
>
> Acked-by: David Scott <dave.scott@citrix.com>
Thank you.
On that basis, Released-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>
> On 6 Oct 2014, at 14:22, Olaf Hering <olaf@aepfle.de> wrote:
>
> > While implementing the --enable-rpath change I noticed that a ocaml
> > build does not use APPEND_LDFLAGS. Make use of APPEND_CFLAGS and
> > APPEND_LDFLAGS as it is done already in other places.
> >
> > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> > Cc: David Scott <dave.scott@eu.citrix.com>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > Cc: Ian Campbell <ian.campbell@citrix.com>
> > Cc: Wei Liu <wei.liu2@citrix.com>
> > ---
> > tools/ocaml/libs/xb/Makefile | 1 +
> > tools/ocaml/libs/xc/Makefile | 1 +
> > tools/ocaml/libs/xentoollog/Makefile | 1 +
> > tools/ocaml/libs/xl/Makefile | 1 +
> > tools/ocaml/test/Makefile | 1 +
> > tools/ocaml/xenstored/Makefile | 2 ++
> > 6 files changed, 7 insertions(+)
> >
> > diff --git a/tools/ocaml/libs/xb/Makefile b/tools/ocaml/libs/xb/Makefile
> > index 62ffefb..09d1bc8 100644
> > --- a/tools/ocaml/libs/xb/Makefile
> > +++ b/tools/ocaml/libs/xb/Makefile
> > @@ -5,6 +5,7 @@ include $(TOPLEVEL)/common.make
> > CFLAGS += -I../mmap
> > CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb()
> > CFLAGS += $(CFLAGS_xeninclude)
> > +CFLAGS += $(APPEND_CFLAGS)
> > OCAMLINCLUDE += -I ../mmap
> > OCAMLOPTFLAGS += -for-pack Xenbus
> >
> > diff --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile
> > index 239c187..d24b014 100644
> > --- a/tools/ocaml/libs/xc/Makefile
> > +++ b/tools/ocaml/libs/xc/Makefile
> > @@ -3,6 +3,7 @@ XEN_ROOT=$(TOPLEVEL)/../..
> > include $(TOPLEVEL)/common.make
> >
> > CFLAGS += -I../mmap $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
> > +CFLAGS += $(APPEND_CFLAGS)
> > OCAMLINCLUDE += -I ../mmap
> >
> > OBJS = xenctrl
> > diff --git a/tools/ocaml/libs/xentoollog/Makefile b/tools/ocaml/libs/xentoollog/Makefile
> > index f2134b8..666eb66 100644
> > --- a/tools/ocaml/libs/xentoollog/Makefile
> > +++ b/tools/ocaml/libs/xentoollog/Makefile
> > @@ -6,6 +6,7 @@ include $(TOPLEVEL)/common.make
> > CFLAGS += -Wno-declaration-after-statement
> >
> > CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
> > +CFLAGS += $(APPEND_CFLAGS)
> > OCAMLINCLUDE +=
> >
> > OBJS = xentoollog
> > diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile
> > index 61eb44c..0d1549d 100644
> > --- a/tools/ocaml/libs/xl/Makefile
> > +++ b/tools/ocaml/libs/xl/Makefile
> > @@ -7,6 +7,7 @@ CFLAGS += -Wno-unused -Wno-declaration-after-statement
> >
> > CFLAGS += $(CFLAGS_libxenlight)
> > CFLAGS += -I ../xentoollog
> > +CFLAGS += $(APPEND_CFLAGS)
> >
> > OBJS = xenlight
> > INTF = xenlight.cmi
> > diff --git a/tools/ocaml/test/Makefile b/tools/ocaml/test/Makefile
> > index 8033089..b75726f 100644
> > --- a/tools/ocaml/test/Makefile
> > +++ b/tools/ocaml/test/Makefile
> > @@ -3,6 +3,7 @@ OCAML_TOPLEVEL = $(CURDIR)/..
> > include $(OCAML_TOPLEVEL)/common.make
> >
> > CFLAGS += $(CFLAGS_libxenlight)
> > +CFLAGS += $(APPEND_CFLAGS)
> > LIBS_xenlight = $(LDLIBS_libxenlight)
> >
> > OCAMLINCLUDE += \
> > diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile
> > index 068e04a..ec19709 100644
> > --- a/tools/ocaml/xenstored/Makefile
> > +++ b/tools/ocaml/xenstored/Makefile
> > @@ -7,7 +7,9 @@ CFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_CFLAGS)
> > LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
> >
> > CFLAGS += $(CFLAGS-y)
> > +CFLAGS += $(APPEND_CFLAGS)
> > LDFLAGS += $(LDFLAGS-y)
> > +LDFLAGS += $(APPEND_LDFLAGS)
> >
> > OCAMLINCLUDE += \
> > -I $(OCAML_TOPLEVEL)/libs/xb \
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH for-xen-4.5] tools/ocaml: use APPEND_CFLAGS and APPEND_LDFLAGS
2014-10-07 14:47 ` Konrad Rzeszutek Wilk
@ 2014-10-08 12:55 ` Ian Campbell
0 siblings, 0 replies; 4+ messages in thread
From: Ian Campbell @ 2014-10-08 12:55 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Dave Scott, Wei Liu, Olaf Hering, xen-devel@lists.xen.org,
Stefano Stabellini, Ian Jackson
On Tue, 2014-10-07 at 10:47 -0400, Konrad Rzeszutek Wilk wrote:
> On Tue, Oct 07, 2014 at 12:17:03PM +0000, Dave Scott wrote:
> > Looks good to me.
> >
> > Acked-by: David Scott <dave.scott@citrix.com>
>
> Thank you.
>
> On that basis, Released-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-10-08 12:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-06 13:22 [PATCH for-xen-4.5] tools/ocaml: use APPEND_CFLAGS and APPEND_LDFLAGS Olaf Hering
2014-10-07 12:17 ` Dave Scott
2014-10-07 14:47 ` Konrad Rzeszutek Wilk
2014-10-08 12:55 ` Ian Campbell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.