Message ID | 20170323193700.30404-1-bernd.kuhls@t-online.de |
---|---|
State | Accepted |
Headers | show |
Hello, On Thu, 23 Mar 2017 20:37:00 +0100, Bernd Kuhls wrote: > ntp defaults to use ssp support > http://bk1.ntp.org/ntp-stable/sntp/harden/README > > by using these flags > http://bk1.ntp.org/ntp-stable/sntp/harden/linux > > If the toolchain lacks SSP support this patch forces ntp to use an > empty set of flags: http://bk1.ntp.org/ntp-stable/sntp/harden/default > > Fixes > http://autobuild.buildroot.net/results/1d5/1d58bd8745b22c8eb71fea4c7255d3ace69f6f7a/ > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > package/ntp/ntp.mk | 6 ++++++ > 1 file changed, 6 insertions(+) I've applied to fix the immediate build issues. However, I'm wondering if we shouldn't use --with-locfile=default unconditionally, and let Buildroot decide what CFLAGS are appropriate. What do you think? Thomas
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes: > ntp defaults to use ssp support > http://bk1.ntp.org/ntp-stable/sntp/harden/README > by using these flags > http://bk1.ntp.org/ntp-stable/sntp/harden/linux > If the toolchain lacks SSP support this patch forces ntp to use an > empty set of flags: http://bk1.ntp.org/ntp-stable/sntp/harden/default > Fixes > http://autobuild.buildroot.net/results/1d5/1d58bd8745b22c8eb71fea4c7255d3ace69f6f7a/ > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Committed to 2017.02.x, thanks.
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index b6eb1b186..e3e53a803 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -23,6 +23,12 @@ NTP_CONF_OPTS = \ # 0002-ntp-syscalls-fallback.patch NTP_AUTORECONF = YES +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y) +NTP_CONF_OPTS += --with-locfile=linux +else +NTP_CONF_OPTS += --with-locfile=default +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) NTP_CONF_OPTS += --enable-linuxcaps NTP_DEPENDENCIES += libcap
ntp defaults to use ssp support http://bk1.ntp.org/ntp-stable/sntp/harden/README by using these flags http://bk1.ntp.org/ntp-stable/sntp/harden/linux If the toolchain lacks SSP support this patch forces ntp to use an empty set of flags: http://bk1.ntp.org/ntp-stable/sntp/harden/default Fixes http://autobuild.buildroot.net/results/1d5/1d58bd8745b22c8eb71fea4c7255d3ace69f6f7a/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/ntp/ntp.mk | 6 ++++++ 1 file changed, 6 insertions(+)