diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-11-11 09:49:20 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-11-11 09:49:20 +0000 |
| commit | 6966aa0d50fb96dbcdf8d574b2a91dd9f09742a4 (patch) | |
| tree | 89b85882483b7e0afc2f77574eb57fc24110ea5a /package/network/services/lldpd/patches | |
| parent | da53ac677f479177455f77843f138d09225d46ec (diff) | |
| download | upstream-6966aa0d50fb96dbcdf8d574b2a91dd9f09742a4.tar.gz upstream-6966aa0d50fb96dbcdf8d574b2a91dd9f09742a4.tar.bz2 upstream-6966aa0d50fb96dbcdf8d574b2a91dd9f09742a4.zip | |
lldpd: allow discovery protocols to be disabled from menuconfig
Signed-off-by: Michel Stam <m.stam@fugro.nl>
[jow: fixed condition for CONFIG_LLDPD_WITH_JSON]
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 43233
Diffstat (limited to 'package/network/services/lldpd/patches')
| -rw-r--r-- | package/network/services/lldpd/patches/002-no-stack-protector.patch | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package/network/services/lldpd/patches/002-no-stack-protector.patch b/package/network/services/lldpd/patches/002-no-stack-protector.patch index dc861bac64..8a49d2d134 100644 --- a/package/network/services/lldpd/patches/002-no-stack-protector.patch +++ b/package/network/services/lldpd/patches/002-no-stack-protector.patch @@ -1,10 +1,11 @@ --- a/configure.ac +++ b/configure.ac -@@ -62,7 +62,6 @@ AX_CFLAGS_GCC_OPTION([-Wformat]) +@@ -62,7 +62,5 @@ AX_CFLAGS_GCC_OPTION([-Wformat]) AX_CFLAGS_GCC_OPTION([-Wformat-security]) AX_CFLAGS_GCC_OPTION([-Wcast-align]) AX_CFLAGS_GCC_OPTION([-Winline]) -AX_CFLAGS_GCC_OPTION([-fstack-protector]) +-AX_CFLAGS_GCC_OPTION([-fstack-protector-strong]) + AX_CFLAGS_GCC_OPTION([-fno-omit-frame-pointer]) AX_CFLAGS_GCC_OPTION([-D_FORTIFY_SOURCE=2]) - AX_CFLAGS_GCC_OPTION([-Wdeclaration-after-statement]) AX_CFLAGS_GCC_OPTION([-Wno-unused-parameter]) |