[PATCH] tools/ocaml: unify build process

[PATCH] tools/ocaml: unify build process

[Christoph Egger]

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]


Unify ocaml build process for different platforms.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

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



-- 
---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

[-- Attachment #2: xen_tools_build.diff --]
[-- Type: text/plain, Size: 624 bytes --]

diff -r 0d092359d86f tools/ocaml/common.make
--- a/tools/ocaml/common.make	Wed Oct 26 10:32:36 2011 +0200
+++ b/tools/ocaml/common.make	Tue Nov 01 10:05:59 2011 +0100
@@ -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

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH] tools/ocaml: unify build process

[Ian Jackson]

Christoph Egger writes ("[Xen-devel] [PATCH] tools/ocaml: unify build process"):
> Unify ocaml build process for different platforms.
> 
> Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

> 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.

Re: [PATCH] tools/ocaml: unify build process

[Christoph Egger]

On 11/01/11 20:04, Ian Jackson wrote:
> Christoph Egger writes ("[Xen-devel] [PATCH] tools/ocaml: unify build process"):
>> Unify ocaml build process for different platforms.
>>
>> Signed-off-by: Christoph Egger<Christoph.Egger@amd.com>
>
> Acked-by: Ian Jackson<ian.jackson@eu.citrix.com>
> Committed-by: Ian Jackson<ian.jackson@eu.citrix.com>
>
>> 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


-- 
---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

Re: [PATCH] tools/ocaml: unify build process

[Ian Jackson]

Christoph Egger writes ("Re: [Xen-devel] [PATCH] tools/ocaml: unify build process"):
> On 11/01/11 20:04, Ian Jackson wrote:
> > 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.

Re: [PATCH] tools/ocaml: unify build process

[Christoph Egger]

On 11/02/11 16:53, Ian Jackson wrote:
> Christoph Egger writes ("Re: [Xen-devel] [PATCH] tools/ocaml: unify build process"):
>> On 11/01/11 20:04, Ian Jackson wrote:
>>> 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.

It does. Thank you.

Christoph


-- 
---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