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 | 3886bf6881969b2a54f00238a44bf1f0a716d049 (patch) | |
| tree | d445726c80c975dc876088651f41745b20a89617 /package/network/services/lldpd/patches | |
| parent | 3c5a4358eb5902abf2e10f123b126029f7986706 (diff) | |
| download | master-187ad058-3886bf6881969b2a54f00238a44bf1f0a716d049.tar.gz master-187ad058-3886bf6881969b2a54f00238a44bf1f0a716d049.tar.bz2 master-187ad058-3886bf6881969b2a54f00238a44bf1f0a716d049.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43233 3c298f89-4303-0410-b956-a3cf2f4a3e73
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]) |