diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2019-01-15 11:15:17 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2019-01-16 14:24:37 +0100 |
| commit | 223c4fb704aa187991eb082141536e52499a5428 (patch) | |
| tree | 99935b70e10ccf044d6e9006abb86a0d3fc1a158 | |
| parent | d38bcb9de572ec285bfb67f5a806a55e98a44e13 (diff) | |
| download | buildroot-223c4fb704aa187991eb082141536e52499a5428.tar.gz buildroot-223c4fb704aa187991eb082141536e52499a5428.zip | |
tpm2-tss: fix build with BR2_FORTIFY_SOURCE_1
The configure script passes -U FORTIFY_SOURCE -D FORTIFY_SOURCE=2 by
default, which conflicts with BR2_FORTIFY_SOURCE_1 as -Werror is used:
<cross>-gcc .. -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 .. -D_FORTIFY_SOURCE=1
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
Disable this so the FORTIFY_SOURCE flags in TARGET_CFLAGS (if any) is used
instead.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/tpm2-tss/tpm2-tss.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index e2e58a092d..ecd9db11fa 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -12,9 +12,12 @@ TPM2_TSS_INSTALL_STAGING = YES TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc -# -fstack-protector-all is used by default. Disable that so the -# BR2_SSP_* options in the toolchain wrapper are used instead +# -fstack-protector-all and FORTIFY_SOURCE=2 is used by +# default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options +# in the toolchain wrapper and CFLAGS are used instead TPM2_TSS_CONF_ENV = \ - ax_cv_check_cflags___________Wall__Werror_______fstack_protector_all=no + ax_cv_check_cflags___________Wall__Werror_______fstack_protector_all=no \ + ax_cv_check_ccppflags___________Wall__Werror_______U_FORTIFY_SOURCE=no \ + ax_cv_check_ccppflags___________Wall__Werror_______D_FORTIFY_SOURCE_2=no $(eval $(autotools-package)) |
