* [PATCH] tools: ocaml: push CFLAGS usage down into the specific bindings
@ 2011-03-31 10:41 ` Ian Campbell
2011-03-31 18:31 ` [PATCH] tools: ocaml: push CFLAGS usage down into the specific bindings [and 2 more messages] Ian Jackson
0 siblings, 1 reply; 4+ messages in thread
From: Ian Campbell @ 2011-03-31 10:41 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1301568069 -3600
# Node ID ae7532099ea5045278c9dcf8a593da497722a11f
# Parent 43ecf2418e94e89ea4fc28252e4710e7eee56098
tools: ocaml: push CFLAGS usage down into the specific bindings
So each binding only builds against what it requires.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
diff -r 43ecf2418e94 -r ae7532099ea5 tools/ocaml/common.make
--- a/tools/ocaml/common.make Thu Mar 31 11:34:35 2011 +0100
+++ b/tools/ocaml/common.make Thu Mar 31 11:41:09 2011 +0100
@@ -9,7 +9,6 @@ OCAMLLEX ?= ocamllex
OCAMLYACC ?= ocamlyacc
CFLAGS += -fPIC -Werror
-CFLAGS += $(CFLAGS_xeninclude) $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_libxenlight)
CFLAGS-$(CONFIG_Linux) += -I/usr/lib64/ocaml -I/usr/lib/ocaml
CFLAGS-$(CONFIG_NetBSD) += -I/usr/pkg/lib/ocaml -fPIC
diff -r 43ecf2418e94 -r ae7532099ea5 tools/ocaml/libs/eventchn/Makefile
--- a/tools/ocaml/libs/eventchn/Makefile Thu Mar 31 11:34:35 2011 +0100
+++ b/tools/ocaml/libs/eventchn/Makefile Thu Mar 31 11:41:09 2011 +0100
@@ -2,6 +2,8 @@ TOPLEVEL=$(CURDIR)/../..
XEN_ROOT=$(TOPLEVEL)/../..
include $(TOPLEVEL)/common.make
+CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude)
+
OBJS = eventchn
INTF = $(foreach obj, $(OBJS),$(obj).cmi)
LIBS = eventchn.cma eventchn.cmxa
diff -r 43ecf2418e94 -r ae7532099ea5 tools/ocaml/libs/xb/Makefile
--- a/tools/ocaml/libs/xb/Makefile Thu Mar 31 11:34:35 2011 +0100
+++ b/tools/ocaml/libs/xb/Makefile Thu Mar 31 11:41:09 2011 +0100
@@ -3,6 +3,8 @@ XEN_ROOT=$(TOPLEVEL)/../..
include $(TOPLEVEL)/common.make
CFLAGS += -I../mmap
+CFLAGS += $(CFLAGS_libxenctrl) # For xen_mb()
+CFLAGS += $(CFLAGS_xeninclude)
OCAMLINCLUDE += -I ../mmap
.NOTPARALLEL:
diff -r 43ecf2418e94 -r ae7532099ea5 tools/ocaml/libs/xl/Makefile
--- a/tools/ocaml/libs/xl/Makefile Thu Mar 31 11:34:35 2011 +0100
+++ b/tools/ocaml/libs/xl/Makefile Thu Mar 31 11:41:09 2011 +0100
@@ -2,6 +2,8 @@ TOPLEVEL=$(CURDIR)/../..
XEN_ROOT=$(TOPLEVEL)/../..
include $(TOPLEVEL)/common.make
+CFLAGS += $(CFLAGS_libxenlight)
+
OBJS = xl
INTF = xl.cmi
LIBS = xl.cma xl.cmxa
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] tools: ocaml: drop some commented out build rules
@ 2011-03-31 10:41 ` Ian Campbell
2011-03-31 10:41 ` [PATCH] tools: ocaml: push CFLAGS usage down into the specific bindings Ian Campbell
0 siblings, 1 reply; 4+ messages in thread
From: Ian Campbell @ 2011-03-31 10:41 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1301568086 -3600
# Node ID c5c4486138cc92ad1cd4a7080d9a6074dd31b756
# Parent ae7532099ea5045278c9dcf8a593da497722a11f
tools: ocaml: drop some commented out build rules.
These are covered by tools/ocaml/Makefile.rules now
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
diff -r ae7532099ea5 -r c5c4486138cc tools/ocaml/libs/xs/Makefile
--- a/tools/ocaml/libs/xs/Makefile Thu Mar 31 11:41:09 2011 +0100
+++ b/tools/ocaml/libs/xs/Makefile Thu Mar 31 11:41:26 2011 +0100
@@ -23,14 +23,6 @@ libs: $(LIBS)
xs_OBJS = $(OBJS)
OCAML_NOC_LIBRARY = xs
-#xs.cmxa: $(foreach obj,$(OBJS),$(obj).cmx)
-# $(E) " MLLIB $@"
-# $(Q)$(OCAMLOPT) $(OCAMLOPTFLAGS) -a -o $@ $(foreach obj,$(OBJS),$(obj).cmx)
-#
-#xs.cma: $(foreach obj,$(OBJS),$(obj).cmo)
-# $(E) " MLLIB $@"
-# $(Q)$(OCAMLC) -a -o $@ $(foreach obj,$(OBJS),$(obj).cmo)
-
.PHONY: install
install: $(LIBS) META
mkdir -p $(OCAMLDESTDIR)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] tools: ocaml: drop redefinition of xen_mb
@ 2011-03-31 10:41 Ian Campbell
2011-03-31 10:41 ` [PATCH] tools: ocaml: drop some commented out build rules Ian Campbell
0 siblings, 1 reply; 4+ messages in thread
From: Ian Campbell @ 2011-03-31 10:41 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1301568095 -3600
# Node ID b56a21124c7f02979cf96b2404c6ecc0bc48e6f7
# Parent c5c4486138cc92ad1cd4a7080d9a6074dd31b756
tools: ocaml: drop redefinition of xen_mb
This is always available to the in-tree build.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
diff -r c5c4486138cc -r b56a21124c7f tools/ocaml/libs/xb/xs_ring_stubs.c
--- a/tools/ocaml/libs/xb/xs_ring_stubs.c Thu Mar 31 11:41:26 2011 +0100
+++ b/tools/ocaml/libs/xb/xs_ring_stubs.c Thu Mar 31 11:41:35 2011 +0100
@@ -35,10 +35,6 @@
#define GET_C_STRUCT(a) ((struct mmap_interface *) a)
-#ifndef xen_mb
-#define xen_mb() mb()
-#endif
-
static int xs_ring_read(struct mmap_interface *interface,
char *buffer, int len)
{
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tools: ocaml: push CFLAGS usage down into the specific bindings [and 2 more messages]
2011-03-31 10:41 ` [PATCH] tools: ocaml: push CFLAGS usage down into the specific bindings Ian Campbell
@ 2011-03-31 18:31 ` Ian Jackson
0 siblings, 0 replies; 4+ messages in thread
From: Ian Jackson @ 2011-03-31 18:31 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
Ian Campbell writes ("[Xen-devel] [PATCH] tools: ocaml: push CFLAGS usage down into the specific bindings"):
> tools: ocaml: push CFLAGS usage down into the specific bindings
> tools: ocaml: drop some commented out build rules.
> tools: ocaml: drop redefinition of xen_mb
Applied these three.
Ian.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-31 18:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-31 10:41 [PATCH] tools: ocaml: drop redefinition of xen_mb Ian Campbell
2011-03-31 10:41 ` [PATCH] tools: ocaml: drop some commented out build rules Ian Campbell
2011-03-31 10:41 ` [PATCH] tools: ocaml: push CFLAGS usage down into the specific bindings Ian Campbell
2011-03-31 18:31 ` [PATCH] tools: ocaml: push CFLAGS usage down into the specific bindings [and 2 more messages] Ian Jackson
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).