Re: tools: ocaml build error

[Christoph Egger <Christoph.Egger@amd.com>]

On 05/11/11 12:45, Ian Campbell wrote:
> On Wed, 2011-05-11 at 11:14 +0100, Christoph Egger wrote:
>> On 05/11/11 12:16, Ian Campbell wrote:
>>> On Wed, 2011-05-11 at 10:48 +0100, Christoph Egger wrote:
>>>> Hi,
>>>>
>>>> Compiling the ocaml fails:
>>>>
>>>> Parsing tools/ocaml/libs/xl/../../../../tools/libxl/libxl.idl
>>>> sed: 1: "1i(*\
>>>>     * AUTO-GENERATED ...": command i expects \ followed by test
>>>> gmake[7]: Leaving directory `tools/ocaml/libs/xl'
>>>
>>> I guess the sed script in tools/ocaml/libs/xl/Makefile has some
>>> non-posix-ism in it.
>>>
>>> Using gnu sed with --posix the following works for me (I dropped the
>>> --posix). Does it help ?
>>
>> Yes, it does. Thanks.
>
> Thanks, changeloged and signed-off-by-ed version below.

Please commit.

Christoph


>
> Ian.
>
> 8<----------------
>
> # HG changeset patch
> # User Ian Campbell<ian.campbell@citrix.com>
> # Date 1305110703 -3600
> # Node ID 58ace7f6b4b2ca6ebe484779f331fa60bd75c83b
> # Parent  e0e7fec9df32ac865a93f63d2ab21b98653efe14
> tools: ocaml: remove non-posix-ism from sed script.
>
> Christoph Egger reported than on NetBSD the build fails with
>
> 	Parsing tools/ocaml/libs/xl/../../../../tools/libxl/libxl.idl
> 	sed: 1: "1i(*\
> 	  * AUTO-GENERATED ...": command i expects \ followed by test
> 	gmake[7]: Leaving directory `tools/ocaml/libs/xl'
>
> The following was tested by Christoph on NetBSD and also with GNU-sed
> with and without the --posix flag.
>
> Signed-off-by: Ian Campbell<ian.campbell@citrix.com>
>
> diff -r e0e7fec9df32 -r 58ace7f6b4b2 tools/ocaml/libs/xl/Makefile
> --- a/tools/ocaml/libs/xl/Makefile	Wed May 11 11:34:16 2011 +0100
> +++ b/tools/ocaml/libs/xl/Makefile	Wed May 11 11:45:03 2011 +0100
> @@ -24,7 +24,7 @@ GENERATED_FILES += _libxl_types.inc
>   all: $(INTF) $(LIBS)
>
>   xl.ml: xl.ml.in _libxl_types.ml.in
> -	$(Q)sed -e '1i(*\
> +	$(Q)sed -e '1i\(*\
>    * AUTO-GENERATED FILE DO NOT EDIT\
>    * Generated from xl.ml.in and _libxl_types.ml.in\
>    *)\
> @@ -33,7 +33,7 @@ xl.ml: xl.ml.in _libxl_types.ml.in
>   	<  xl.ml.in>  xl.ml
>
>   xl.mli: xl.mli.in _libxl_types.mli.in
> -	$(Q)sed -e '1i(*\
> +	$(Q)sed -e '1i\(*\
>    * AUTO-GENERATED FILE DO NOT EDIT\
>    * Generated from xl.mli.in and _libxl_types.mli.in\
>    *)\
>
>
>


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