[PATCH kvm-unit-tests v3] configure: fix non-newlib cross-compiling

[PATCH kvm-unit-tests v3] configure: fix non-newlib cross-compiling

[Andrew Jones]

Commit 529046c3 "libcflat: add PRI(dux)32 format types" applies a
detection trick that requires native compiling or cross-compiling
with newlib, an embedded system C standard library. We can avoid
the new dependency with a different trick.

Cc: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Andrew Jones <drjones@redhat.com>

---
v3: don't forget to use cross-cc [Alex]
v2: drop the awk magic and just grep for long, as not all compilers
    have long in the same place
---
 configure | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 127868ce3090..8821f3741836 100755
--- a/configure
+++ b/configure
@@ -12,6 +12,7 @@ host=$arch
 cross_prefix=
 endian=""
 pretty_print_stacks=yes
+u32_long=
 
 usage() {
     cat <<-EOF
@@ -110,16 +111,11 @@ if [ -f $testdir/run ]; then
 fi
 
 # check if uint32_t needs a long format modifier
-cat << EOF > lib_test.c
-#include <inttypes.h>
+cat << EOF > lib-test.c
+__UINT32_TYPE__
 EOF
-
-$cross_prefix$cc lib_test.c -E | grep "typedef" | grep "long" | grep "uint32_t" &> /dev/null
-exit=$?
-if [ $exit -eq 0 ]; then
-    u32_long=true
-fi
-rm -f lib_test.c
+u32_long=$($cross_prefix$cc -E lib-test.c | grep -v '^#' | grep -q long && echo yes)
+rm -f lib-test.c
 
 # check for dependent 32 bit libraries
 if [ "$arch" != "arm" ]; then
-- 
2.9.3

Re: [PATCH kvm-unit-tests v3] configure: fix non-newlib cross-compiling

[Alex Bennée]

Andrew Jones <drjones@redhat.com> writes:

> Commit 529046c3 "libcflat: add PRI(dux)32 format types" applies a
> detection trick that requires native compiling or cross-compiling
> with newlib, an embedded system C standard library. We can avoid
> the new dependency with a different trick.
>
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Andrew Jones <drjones@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>

>
> ---
> v3: don't forget to use cross-cc [Alex]
> v2: drop the awk magic and just grep for long, as not all compilers
>     have long in the same place
> ---
>  configure | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/configure b/configure
> index 127868ce3090..8821f3741836 100755
> --- a/configure
> +++ b/configure
> @@ -12,6 +12,7 @@ host=$arch
>  cross_prefix=
>  endian=""
>  pretty_print_stacks=yes
> +u32_long=
>
>  usage() {
>      cat <<-EOF
> @@ -110,16 +111,11 @@ if [ -f $testdir/run ]; then
>  fi
>
>  # check if uint32_t needs a long format modifier
> -cat << EOF > lib_test.c
> -#include <inttypes.h>
> +cat << EOF > lib-test.c
> +__UINT32_TYPE__
>  EOF
> -
> -$cross_prefix$cc lib_test.c -E | grep "typedef" | grep "long" | grep "uint32_t" &> /dev/null
> -exit=$?
> -if [ $exit -eq 0 ]; then
> -    u32_long=true
> -fi
> -rm -f lib_test.c
> +u32_long=$($cross_prefix$cc -E lib-test.c | grep -v '^#' | grep -q long && echo yes)
> +rm -f lib-test.c
>
>  # check for dependent 32 bit libraries
>  if [ "$arch" != "arm" ]; then


--
Alex Bennée

Re: [PATCH kvm-unit-tests v3] configure: fix non-newlib cross-compiling

[Radim Krčmář]

2017-01-17 17:03+0000, Alex Bennée:
> Andrew Jones <drjones@redhat.com> writes:
> 
>> Commit 529046c3 "libcflat: add PRI(dux)32 format types" applies a
>> detection trick that requires native compiling or cross-compiling
>> with newlib, an embedded system C standard library. We can avoid
>> the new dependency with a different trick.
>>
>> Cc: Alex Bennée <alex.bennee@linaro.org>
>> Signed-off-by: Andrew Jones <drjones@redhat.com>
> 
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Tested-by: Alex Bennée <alex.bennee@linaro.org>

Applied, thanks.