From mboxrd@z Thu Jan 1 00:00:00 1970 From: unixmania at gmail.com Date: Mon, 23 Dec 2019 08:13:21 -0300 Subject: [Buildroot] [PATCH v3] package/tpm2-tss: fix build without C++ Message-ID: <20191223111321.12912-1-unixmania@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net From: Carlos Santos C++ is required only for the fuzzing tests but AC_PROG_CXX is included by configure.ac even when fuzzing is not enabled (which we don't do on Buildroot). The patch applied upstream had issues and was reverted[1]. Use a local patch to solve the problem temporaryly. Fixes: http://autobuild.buildroot.net/results/13f5e37b47b255da4158bec34e5459136f7e60d4 http://autobuild.buildroot.net/results/1c26db2509c79e00c0de1165945277eaa57b149f http://autobuild.buildroot.net/results/b7b6b7b7aca79e847b442cbd2305427d91fe5d70 http://autobuild.buildroot.net/results/1cd5a82a0e799aa5027e2e2c03b246332cc3a15d http://autobuild.buildroot.net/results/d7ec878907f714377c83e9a496e97cbf9382d787 http://autobuild.buildroot.net/results/1c7f0c1b3ce4871cd87bd6059b1f0a6dc4e74a9c http://autobuild.buildroot.net/results/196b81d580325607c8da90beeb79e1f6b8ab8b47 http://autobuild.buildroot.net/results/f90f7b4ac710b56686635f8ae27059c11b963e47 1. https://github.com/tpm2-software/tpm2-tss/commit/60c26e4c4faba6ba12469485653e17092b510840 --- CC: Yann E. MORIN --- Changes v1->v2: - Use patch from upstream Changes v2->v3: - Use a local patch, since the upstream change was reverted --- ...01-Temporary-fix-for-build-without-C.patch | 44 +++++++++++++++++++ package/tpm2-tss/tpm2-tss.mk | 2 + 2 files changed, 46 insertions(+) create mode 100644 package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch diff --git a/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch b/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch new file mode 100644 index 0000000000..b2a9cb4f78 --- /dev/null +++ b/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch @@ -0,0 +1,44 @@ +From 158d0bc3a2a7a93090cc12c5b0dd3c27e6f44d61 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Mon, 23 Dec 2019 08:02:19 -0300 +Subject: [PATCH] Temporary fix for build without C++ + +C++ is required only for the fuzzing tests but AC_PROG_CXX is included +by configure.ac even when fuzzing is not enabled (which we don't do on +Buildroot). + +The patch applied upstream had issues and was reverted[1]. Use a local +patch to solve the problem temporaryly. + +Fixes: + http://autobuild.buildroot.net/results/13f5e37b47b255da4158bec34e5459136f7e60d4 + http://autobuild.buildroot.net/results/1c26db2509c79e00c0de1165945277eaa57b149f + http://autobuild.buildroot.net/results/b7b6b7b7aca79e847b442cbd2305427d91fe5d70 + http://autobuild.buildroot.net/results/1cd5a82a0e799aa5027e2e2c03b246332cc3a15d + http://autobuild.buildroot.net/results/d7ec878907f714377c83e9a496e97cbf9382d787 + http://autobuild.buildroot.net/results/1c7f0c1b3ce4871cd87bd6059b1f0a6dc4e74a9c + http://autobuild.buildroot.net/results/196b81d580325607c8da90beeb79e1f6b8ab8b47 + http://autobuild.buildroot.net/results/f90f7b4ac710b56686635f8ae27059c11b963e47 + +1. https://github.com/tpm2-software/tpm2-tss/commit/60c26e4c4faba6ba12469485653e17092b510840 + +Signed-off-by: Carlos Santos +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index cd50451d..a3bd7144 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,7 +25,6 @@ AC_CANONICAL_HOST + AX_IS_RELEASE(dash-version) + AX_CHECK_ENABLE_DEBUG([info]) + +-AC_PROG_CXX + AC_PROG_CC + AC_PROG_LN_S + AC_USE_SYSTEM_EXTENSIONS +-- +2.18.1 + diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 425a6703af..08090204ff 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -11,6 +11,8 @@ TPM2_TSS_LICENSE_FILES = LICENSE TPM2_TSS_INSTALL_STAGING = YES TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc --disable-defaultflags +# 0001-configure-Only-use-CXX-when-fuzzing.patch +TPM2_TSS_AUTORECONF = YES # uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" -- 2.18.1