Skip to contentSkip to conversation

tools/ocaml: unify build process

PATCH In review Christoph Egger 2 participants 5 messages Nov 1, 2011 – Nov 2, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/ocaml: unify build process

Unify ocaml build process for different platforms.

P.S.: Please apply this to xen-4.1-testing

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
tools/ocaml/common.make +1 -3
diff -r 0d092359d86f tools/ocaml/common.make
@@ -8,9 +8,7 @@ OCAMLDEP ?= ocamldep
 OCAMLLEX ?= ocamllex
 OCAMLYACC ?= ocamlyacc
 
-CFLAGS += -fPIC -Werror
-CFLAGS-$(CONFIG_Linux) += -I$(shell ocamlc -where)
-CFLAGS-$(CONFIG_NetBSD) += -I/usr/pkg/lib/ocaml -fPIC
+CFLAGS += -fPIC -Werror -I$(shell ocamlc -where)
 
 OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^  *\(-g\) .*/\1/p')
 OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Acked-by on v1 1/1
#1 lore raw

Christoph Egger writes ("[Xen-devel] [PATCH] tools/ocaml: unify build process"):

Quoted 3 lines

Unify ocaml build process for different platforms.

Quoted 1 line

P.S.: Please apply this to xen-4.1-testing

Can you remind me about this after this change has made it through the automatic tester into xen-unstable.hg ? I'd rather not just make the same change to both trees at the same time, no matter how harmless it looks...

Thanks,
Ian.

#2 lore raw
Quoted 8 lines · Ian Jackson

Christoph Egger writes ("[Xen-devel] [PATCH] tools/ocaml: unify build process"):

Quoted 3 lines

Unify ocaml build process for different platforms.

Quoted 6 lines
Quoted 1 line

P.S.: Please apply this to xen-4.1-testing

Can you remind me about this after this change has made it through the automatic tester into xen-unstable.hg ? I'd rather not just make the same change to both trees at the same time, no matter how harmless it looks...

It already happened as of reading your mail. :) So take this as a
reminder: Please apply this to xen-4.1-testing.

Christoph

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
#3 lore raw

Christoph Egger writes ("Re: [Xen-devel] [PATCH] tools/ocaml: unify build process"):

Quoted 8 lines · Ian Jackson
Quoted 4 lines

Can you remind me about this after this change has made it through the automatic tester into xen-unstable.hg ? I'd rather not just make the same change to both trees at the same time, no matter how harmless it looks...

It already happened as of reading your mail. :) So take this as a
reminder: Please apply this to xen-4.1-testing.

The patch didn't apply cleanly, but I have fixed it up in 4.1-testing.hg's 23180:8c2d76193eaf (currently in staging). Please do double-check it works for you.

Thanks,
Ian.

#4 lore raw
Quoted 7 lines · Ian Jackson

Christoph Egger writes ("Re: [Xen-devel] [PATCH] tools/ocaml: unify build process"):

Quoted 6 lines · Ian Jackson
Quoted 4 lines

Can you remind me about this after this change has made it through the automatic tester into xen-unstable.hg ? I'd rather not just make the same change to both trees at the same time, no matter how harmless it looks...

Quoted 6 lines
Quoted 2 lines

It already happened as of reading your mail. :) So take this as a
reminder: Please apply this to xen-4.1-testing.

The patch didn't apply cleanly, but I have fixed it up in 4.1-testing.hg's 23180:8c2d76193eaf (currently in staging). Please do double-check it works for you.

It does. Thank you.

Christoph

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632