| Message ID | 20190115101522.21042-5-peter@korsgaard.com |
|---|---|
| State | Accepted |
| Commit | 8286be28913ef3b93c6edacec15a01d7b23b1566 |
| Headers | show |
| Series | [v2,1/7] tpm2-tss: do not enforce -fstack-protector-all | expand |
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: > 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> Committed, thanks.
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: > 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> Committed to 2018.11.x after adjusting the variable names for v1.3.0, thanks.
diff --git a/package/tpm2-abrmd/tpm2-abrmd.mk b/package/tpm2-abrmd/tpm2-abrmd.mk index 2834615ac3..31f19f5d01 100644 --- a/package/tpm2-abrmd/tpm2-abrmd.mk +++ b/package/tpm2-abrmd/tpm2-abrmd.mk @@ -11,10 +11,13 @@ TPM2_ABRMD_LICENSE_FILES = LICENSE TPM2_ABRMD_INSTALL_STAGING = YES TPM2_ABRMD_DEPENDENCIES = dbus libglib2 tpm2-tss host-pkgconf -# -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_ABRMD_CONF_ENV = \ - ax_cv_check_cflags___________Werror_______fstack_protector_all=no + ax_cv_check_cflags___________Werror_______fstack_protector_all=no \ + ax_cv_check_ccppflags___________Werror_______U_FORTIFY_SOURCE=no \ + ax_cv_check_ccppflags___________Werror_______D_FORTIFY_SOURCE_2=no TPM2_ABRMD_CONF_OPTS += \ --with-systemdsystemunitdir=$(if $(BR2_INIT_SYSTEMD),/usr/lib/systemd/system,no) \
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> --- package/tpm2-abrmd/tpm2-abrmd.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)