From 637c1372bb9b5d7874cb2b365547ab12dbf0ad9f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Oct 2016 15:24:11 +0200 Subject: [PATCH] package/trinity: needs headers >= 3.4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit IPV6_UNICAST_IF was added with kernel 3.4: https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/log/include/linux/in6.h?id=refs/tags/v3.4.112 To prove this compare with kernel 3.3: https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/log/include/linux/in6.h?h=linux-3.3.y The trinity package contains some compat code in https://github.com/kernelslacker/trinity/blob/master/include/compat.h but it does not trigger for IPV6_UNICAST_IF https://github.com/kernelslacker/trinity/blob/master/include/compat.h#L662 Instead of hacking compat.h to death just depend on headers >= 3.4. Fixes a build error net/proto-ipv6.c: At top level: net/proto-ipv6.c:157:12: error: ‘IPV6_UNICAST_IF’ undeclared here (not in a function) { .name = IPV6_UNICAST_IF, }, not yet caught by autobuilders using this defconfig: http://autobuild.buildroot.net/results/394/394e22be0ef986463e97b3040dad8f978262732c/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/trinity/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/trinity/Config.in b/package/trinity/Config.in index 4a31ba0a49..35b54d8306 100644 --- a/package/trinity/Config.in +++ b/package/trinity/Config.in @@ -10,11 +10,13 @@ config BR2_PACKAGE_TRINITY bool "trinity" depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_USES_MUSL # FTW_ACTIONRETVAL + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # IPV6_UNICAST_IF help A Linux System call fuzz tester http://codemonkey.org.uk/projects/trinity/ -comment "trinity needs a uClibc or glibc toolchain" +comment "trinity needs a uClibc or glibc toolchain w/ headers >= 3.4" depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 -- 2.30.2