Re: [Xen-devel] [PATCH 3 of 4 v2] build: detect is libiconv is present

[William Pitcock <nenolod@xxxxxxxxxxxxxxxx>]

Hi,

On Mon, Dec 19, 2011 at 8:19 PM, Roger Pau Monne
<roger.pau@xxxxxxxxxxxxx> wrote:
> # HG changeset patch
> # User Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>
> # Date 1324344612 -3600
> # Node ID 14e911353a91702b439bc06e2a77d67e8bd5f661
> # Parent  23e1abbd203ca2619103f3e95c6b1ff36be60e38
> build: detect is libiconv is present
>
> Detect if libiconv is present in the system, since we will have to
> link against it when using iconv.
>
> Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>
>
> diff -r 23e1abbd203c -r 14e911353a91 Config.mk
> --- a/Config.mk Tue Dec 20 02:28:34 2011 +0100
> +++ b/Config.mk Tue Dec 20 02:30:12 2011 +0100
> @@ -18,6 +18,8 @@ XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARC
>  XEN_OS              ?= $(shell uname -s)
>
>  CONFIG_$(XEN_OS) := y
> +CONFIG_LIBICONV  := $(shell grep -q LIBICONV_PLUG /usr/include/iconv.h \
> +                      && echo 'y' || echo 'n')
>

Please don't check this way, it is not guaranteed to work.  Check
instead for presence of libiconv.so somehow, perhaps using a dummy
program with -liconv or something, or using a construct like:

  test -f /usr/lib/libiconv.so -o -f /lib/libiconv.so -o -f
/usr/local/lib/libiconv.so && echo 'y' || echo 'n'

If upstream removes LIBICONV_PLUG, this check will break.

Otherwise, everything else looks OK to me.

William

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