Re: [Qemu-devel] [PATCH] configure: Check for libfdt version 1.4.0

[David Gibson <david@gibson.dropbear.id.au>]

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

On Mon, May 18, 2015 at 09:43:21AM +0200, Thomas Huth wrote:
> Some recent patches require functions from libfdt version 1.4.0,
> so we should check for this version during the configure step
> already. Unfortunately, there does not seem to be a proper #define
> for the version number in the libfdt headers. So alternatively, we
> check for the availability of the fdtXX_t types instead which have
> just been introduced with version 1.4.0.

Um.. I'm confused by this.  As far as I can recall the fdtXX_t types
have been in libfdt since.. well, forever, basically.

> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  configure | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index b18aa9e..87a5bbc 100755
> --- a/configure
> +++ b/configure
> @@ -3091,9 +3091,10 @@ fi
>  if test "$fdt" != "no" ; then
>    fdt_libs="-lfdt"
>    # explicitly check for libfdt_env.h as it is missing in some stable installs
> +  # and also test for fdtXX_t to make sure we are on a version >= 1.4.0
>    cat > $TMPC << EOF
>  #include <libfdt_env.h>
> -int main(void) { return 0; }
> +int main(void) { fdt32_t x = 0; return x; }
>  EOF
>    if compile_prog "" "$fdt_libs" ; then
>      # system DTC is good - use it
> @@ -3111,7 +3112,7 @@ EOF
>      fdt_libs="-L\$(BUILD_DIR)/dtc/libfdt $fdt_libs"
>    elif test "$fdt" = "yes" ; then
>      # have neither and want - prompt for system/submodule install
> -    error_exit "DTC (libfdt) not present. Your options:" \
> +    error_exit "DTC (libfdt) version >= 1.4.0 not present. Your options:" \
>          "  (1) Preferred: Install the DTC (libfdt) devel package" \
>          "  (2) Fetch the DTC submodule, using:" \
>          "      git submodule update --init dtc"

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]