Re: [Buildroot] [PATCH 1/1] package/tpm2-tss: fix build with autoconf >= 2.70

[Baruch Siach via buildroot <buildroot@buildroot.org>]

Hi Fabrice,

On Wed, Oct 06 2021, Fabrice Fontaine wrote:

> Fix the following build failure raised since bump of autoconf to version
> 2.71 in commit ecd54b65c1f998a7ccd91f7c523e4ff38c4781da:
>
> ./configure: line 14636: syntax error near unexpected token `newline'
> ./configure: line 14636: `    '''
> package/pkg-generic.mk:273: recipe for target
> '/home/buildroot/autobuild/instance-3/output-1/build/tpm2-tss-3.0.3/.stamp_configured'
> failed
>
> It should be noted that this patch is included in version 3.1:
> https://patchwork.ozlabs.org/project/buildroot/patch/RnUd7kxUKLWeLZSMoM1dFtpAD4Qfe3R-67gu27eAGtE6yrgC1oHzq1GwiOoE9Gmk6uZZ-c6k6LUVxdMqKhUro4_bM4zZKPhsbN5e9BV8SV4=@protonmail.com
>
> Fixes:
>  - http://autobuild.buildroot.org/results/5d4ca70ebf30463aa7e8a96a90effa6282f57e21

We have a pending bump to version 3.1.0 in patchwork that should include
this fix:

  http://patchwork.ozlabs.org/project/buildroot/patch/RnUd7kxUKLWeLZSMoM1dFtpAD4Qfe3R-67gu27eAGtE6yrgC1oHzq1GwiOoE9Gmk6uZZ-c6k6LUVxdMqKhUro4_bM4zZKPhsbN5e9BV8SV4=@protonmail.com/

baruch

>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...fix-compatibility-with-autoconf-2-70.patch | 48 +++++++++++++++++++
>  1 file changed, 48 insertions(+)
>  create mode 100644 package/tpm2-tss/0002-configure-ac-fix-compatibility-with-autoconf-2-70.patch
>
> diff --git
> a/package/tpm2-tss/0002-configure-ac-fix-compatibility-with-autoconf-2-70.patch
> b/package/tpm2-tss/0002-configure-ac-fix-compatibility-with-autoconf-2-70.patch
> new file mode 100644
> index 0000000000..f21aa179f8
> --- /dev/null
> +++ b/package/tpm2-tss/0002-configure-ac-fix-compatibility-with-autoconf-2-70.patch
> @@ -0,0 +1,48 @@
> +From 03cca78d24d716eec792f86f5b0bc69886fad981 Mon Sep 17 00:00:00 2001
> +From: Patrick McCarty <patrick.mccarty@intel.com>
> +Date: Fri, 18 Dec 2020 01:54:05 +0000
> +Subject: [PATCH] configure.ac: fix compatibility with autoconf 2.70
> +
> +With autoconf 2.70, not quoting the second argument to one of the AS_IF
> +macro expansions leads to generation of invalid shell code affecting the
> +first nested ERROR_IF_NO_PROG expansion.
> +
> +The invalid shell code leads to an error resembling:
> +
> +  ./configure: line 18826: syntax error near unexpected token `newline'
> +  ./configure: line 18826: `    '''
> +
> +Fix the issue by quoting the second argument to the affected AS_IF,
> +similar to the quoting found elsewhere in configure.ac.
> +
> +Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
> +
> +[Retrieved from:
> +https://github.com/tpm2-software/tpm2-tss/commit/03cca78d24d716eec792f86f5b0bc69886fad981]
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +---
> + configure.ac | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index ff59dd7ce..3049032bc 100755
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -285,7 +285,7 @@ AC_ARG_ENABLE([integration],
> +         [build and execute integration tests])],,
> +     [enable_integration=no])
> + AS_IF([test "x$enable_integration" = "xyes"],
> +-     AS_IF([test "$HOSTOS" = "Linux"],
> ++     [AS_IF([test "$HOSTOS" = "Linux"],
> +            [ERROR_IF_NO_PROG([ss])],
> +            [ERROR_IF_NO_PROG([sockstat])])
> +        ERROR_IF_NO_PROG([echo])
> +@@ -335,7 +335,7 @@ AS_IF([test "x$enable_integration" = "xyes"],
> +              [AC_MSG_ERROR([No simulator executable found in PATH for testing TCTI.])])
> +        AC_SUBST([INTEGRATION_TCTI], [$integration_tcti])
> +        AC_SUBST([INTEGRATION_ARGS], [$integration_args])
> +-       AC_SUBST([ENABLE_INTEGRATION], [$enable_integration]))
> ++       AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])])
> + AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
> + #
> + # sanitizer compiler flags


-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot