tpm2-tss: fix build with BR2_FORTIFY_SOURCE_1
PATCH 1/1 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) are used instead.
--- package/tpm2-tss/tpm2-tss.mk | 6 ++++++ 1 file changed, 6 insertions(+)
package/tpm2-tss/tpm2-tss.mk +6 -0
@@ -16,4 +16,10 @@ TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc # libssp is missing. TPM2_TSS_CONF_ENV = ax_cv_check_cflags___________Wall__Werror_______fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) +# configure.ac uses FORTIFY_SOURCE=2 by default. Disable that so the +# BR2_FORTIFY_SOURCE_* options in CFLAGS are used instead +sTPM2_TSS_CONF_ENV += \ + ax_cv_check_ccppflags___________Wall__Werror_______U_FORTIFY_SOURCE=no \ + ax_cv_check_ccppflags___________Wall__Werror_______D_FORTIFY_SOURCE_2=no + $(eval $(autotools-package))
Signature · 1 line
2.11.0
PATCH 1/1 tpm2-tss: fix build with BR2_FORTIFY_SOURCE_1
Quoted 26 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
The configure script passes -U
FORTIFY_SOURCE-D FORTIFY_SOURCE=2 by default, which conflicts withBR2_FORTIFY_SOURCE_1as -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_SOURCEflags inTARGET_CFLAGS(if any) are used instead.Signed-off-by Peter Korsgaard <[email protected]>--- package/tpm2-tss/tpm2-tss.mk | 6 ++++++ 1 file changed, 6 insertions(+)package/tpm2-tss/tpm2-tss.mk +0
-0@@ -16,4 +16,10 @@ TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc # libssp is missing. TPM2_TSS_CONF_ENV =ax_cv_check_cflags___________Wall__Werror_______fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no)
package/tpm2-tss/tpm2-tss.mk TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc · line 21
Quoted 3 lines
package/tpm2-tss/tpm2-tss.mk +3
-0+# configure.ac uses FORTIFY_SOURCE=2 by default. Disable that so the +# BR2_FORTIFY_SOURCE_* options in CFLAGS are used instead +sTPM2_TSS_CONF_ENV += \
Ehh, there's naturally a typo here in the variable name. I'll send an updated patch.
Signature · 1 line
Bye, Peter Korsgaard