IIRC Paolo's ack on this patch came with a caveat of "if it is
not for -stable" -- cc'ing him.
thanks
-- PMM
On 19 June 2013 15:48, Cole Robinson <crobi...@redhat.com> wrote:
> CCing qemu-stable. We want this for Fedora 19 at least where updated dtc broke
> our build.
>
> - Cole
>
> On 06/14/2013 10:53 AM, Peter Maydell wrote:
>> From: Peter Crosthwaite <peter.crosthwa...@xilinx.com>
>>
>> Currently QEMU provides a local clone of the file libfdt_env.h in
>> /include. This file is supposed to come with the libfdt package and is
>> only needed for broken installs of libfdt. Now that we have submodule
>> dtc, just ignore these broken installs and prompt for the dtc submodule
>> install instead. QEMU's local libfdt_env.h is removed accordingly.
>>
>> Manifests as a bug when building QEMU with modern libfdt. The new
>> version of libfdt does not compile when QEMUs libfdt_env.h takes
>> precedence over the hosts.
>>
>> Signed-off-by: Peter Crosthwaite <peter.crosthwa...@xilinx.com>
>> Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
>> Acked-by: David Gibson <da...@gibson.dropbear.id.au>
>> Signed-off-by: Kim Phillips <kim.phill...@freescale.com>
>> Acked-by: Paolo Bonzini <pbonz...@redhat.com>
>> Message-id:
>> 9b6a3a52e3f46cfbc1ded9ab56385ec045e46705.1369628289.git.peter.crosthwa...@xilinx.com
>> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
>> ---
>> configure | 2 ++
>> include/libfdt_env.h | 36 ------------------------------------
>> 2 files changed, 2 insertions(+), 36 deletions(-)
>> delete mode 100644 include/libfdt_env.h
>>
>> diff --git a/configure b/configure
>> index 8732185..31b7783 100755
>> --- a/configure
>> +++ b/configure
>> @@ -2488,7 +2488,9 @@ fi
>> # fdt probe
>> if test "$fdt" != "no" ; then
>> fdt_libs="-lfdt"
>> + # explicitly check for libfdt_env.h as it is missing in some stable
>> installs
>> cat > $TMPC << EOF
>> +#include <libfdt_env.h>
>> int main(void) { return 0; }
>> EOF
>> if compile_prog "" "$fdt_libs" ; then
>> diff --git a/include/libfdt_env.h b/include/libfdt_env.h
>> deleted file mode 100644
>> index 3667d4c..0000000
>> --- a/include/libfdt_env.h
>> +++ /dev/null
>> @@ -1,36 +0,0 @@
>> -/*
>> - * This program is free software; you can redistribute it and/or modify
>> - * it under the terms of the GNU General Public License, version 2, as
>> - * published by the Free Software Foundation.
>> - *
>> - * This program is distributed in the hope that it will be useful,
>> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> - * GNU General Public License for more details.
>> - *
>> - * You should have received a copy of the GNU General Public License
>> - * along with this program; if not, see <http://www.gnu.org/licenses/>.
>> - *
>> - * Copyright IBM Corp. 2008
>> - * Authors: Hollis Blanchard <holl...@us.ibm.com>
>> - *
>> - */
>> -
>> -#ifndef _LIBFDT_ENV_H
>> -#define _LIBFDT_ENV_H
>> -
>> -#include "qemu/bswap.h"
>> -
>> -#ifdef HOST_WORDS_BIGENDIAN
>> -#define fdt32_to_cpu(x) (x)
>> -#define cpu_to_fdt32(x) (x)
>> -#define fdt64_to_cpu(x) (x)
>> -#define cpu_to_fdt64(x) (x)
>> -#else
>> -#define fdt32_to_cpu(x) bswap32(x)
>> -#define cpu_to_fdt32(x) bswap32(x)
>> -#define fdt64_to_cpu(x) bswap64(x)
>> -#define cpu_to_fdt64(x) bswap64(x)
>> -#endif
>> -
>> -#endif /* _LIBFDT_ENV_H */
>>
>
