| Message ID | 20180322202752.2562-5-casantos@datacom.ind.br |
|---|---|
| State | Accepted |
| Commit | f2bd679c9dcd48a5ba3445f99524303bed9cf252 |
| Headers | show |
| Series | tpm2-{tss, abrmd, tools} fix compilation errors | expand |
>>>>> "Carlos" == Carlos Santos <casantos@datacom.ind.br> writes: > Disable SSP if the toolchain does not support it. This must be done > explicitly because configure.ac passes -fstack-protector-all to the > compiler but doesn't contain a link test, so it doesn't detect when > libssp is missing. > Fixes: > http://autobuild.buildroot.net/results/83ad1f33f523321f841e70d2d8cf5ce861dee217 > http://autobuild.buildroot.net/results/cef047751534fef23d1022e9a276424bc84bf461 > http://autobuild.buildroot.net/results/6048355337804f7841dffa1655f44b9f6db56314 > http://autobuild.buildroot.net/results/d934a2ea90e7bf1c7b93dbb367998abab536daf4 > http://autobuild.buildroot.net/results/c0daaf37b8d1515d62d2441ba6aa57125437e191 > http://autobuild.buildroot.net/results/9482ea5554938865e0061dcbdcf3c2c918b96954 > http://autobuild.buildroot.net/results/282a8b6769f19f0a40089207bc54e7302663751f > Signed-off-by: Carlos Santos <casantos@datacom.ind.br> > --- > package/tpm2-abrmd/tpm2-abrmd.mk | 4 ++++ > 1 file changed, 4 insertions(+) > diff --git a/package/tpm2-abrmd/tpm2-abrmd.mk b/package/tpm2-abrmd/tpm2-abrmd.mk > index 0d6a167210..69d09a59e4 100644 > --- a/package/tpm2-abrmd/tpm2-abrmd.mk > +++ b/package/tpm2-abrmd/tpm2-abrmd.mk > @@ -11,6 +11,10 @@ TPM2_ABRMD_LICENSE_FILES = LICENSE > TPM2_ABRMD_INSTALL_STAGING = YES > TPM2_ABRMD_DEPENDENCIES = dbus libglib2 tpm2-tss host-pkgconf > +# configure.ac doesn't contain a link test, so it doesn't detect when You have a trailing space here. Committed with that fixed, thanks.
diff --git a/package/tpm2-abrmd/tpm2-abrmd.mk b/package/tpm2-abrmd/tpm2-abrmd.mk index 0d6a167210..69d09a59e4 100644 --- a/package/tpm2-abrmd/tpm2-abrmd.mk +++ b/package/tpm2-abrmd/tpm2-abrmd.mk @@ -11,6 +11,10 @@ TPM2_ABRMD_LICENSE_FILES = LICENSE TPM2_ABRMD_INSTALL_STAGING = YES TPM2_ABRMD_DEPENDENCIES = dbus libglib2 tpm2-tss host-pkgconf +# configure.ac doesn't contain a link test, so it doesn't detect when +# libssp is missing. +TPM2_ABRMD_CONF_ENV = ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) + TPM2_ABRMD_CONF_OPTS += \ --with-systemdsystemunitdir=$(if $(BR2_INIT_SYSTEMD),/usr/lib/systemd/system,no) \ --with-udevrulesdir=$(if $(BR2_PACKAGE_HAS_UDEV),/usr/lib/udev/rules.d,no)
Disable SSP if the toolchain does not support it. This must be done explicitly because configure.ac passes -fstack-protector-all to the compiler but doesn't contain a link test, so it doesn't detect when libssp is missing. Fixes: http://autobuild.buildroot.net/results/83ad1f33f523321f841e70d2d8cf5ce861dee217 http://autobuild.buildroot.net/results/cef047751534fef23d1022e9a276424bc84bf461 http://autobuild.buildroot.net/results/6048355337804f7841dffa1655f44b9f6db56314 http://autobuild.buildroot.net/results/d934a2ea90e7bf1c7b93dbb367998abab536daf4 http://autobuild.buildroot.net/results/c0daaf37b8d1515d62d2441ba6aa57125437e191 http://autobuild.buildroot.net/results/9482ea5554938865e0061dcbdcf3c2c918b96954 http://autobuild.buildroot.net/results/282a8b6769f19f0a40089207bc54e7302663751f Signed-off-by: Carlos Santos <casantos@datacom.ind.br> --- package/tpm2-abrmd/tpm2-abrmd.mk | 4 ++++ 1 file changed, 4 insertions(+)