iptables: additional include path required after UAPI changes

PATCH Applied Phil Oester 2 participants 2 messages Jul 21, 2013 – Jul 24, 2013 netfilter

Share & tools

Phil Oester

author

2013-07-21 15:30 UTC #0 lore raw

PATCH 1/1 iptables: additional include path required after UAPI changes

After kernel commit 607ca46e (UAPI: (Scripted) Disintegrate include/linux), using the "--with-kernel" argument to build iptables stopped working due to the missing #ifdefs in the original files. We need to make sure the UAPI include dir is listed before the original location. Leaving both allows support for old and new kernels.

This fixes bug #833.

Phil

Signed-off-by Phil Oester <[email protected]>

configure.ac +2 -2

index be216b0..5ed5165 100644
@@ -114,10 +114,10 @@ regular_CPPFLAGS="${largefile_cppflags} -D_REENTRANT \
 	-DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" -DXTABLES_INTERNAL";
 kinclude_CPPFLAGS="";
 if [[ -n "$kbuilddir" ]]; then
-	kinclude_CPPFLAGS="$kinclude_CPPFLAGS -I$kbuilddir/include";
+	kinclude_CPPFLAGS="$kinclude_CPPFLAGS -I$kbuilddir/include/uapi -I$kbuilddir/include";
 fi;
 if [[ -n "$ksourcedir" ]]; then
-	kinclude_CPPFLAGS="$kinclude_CPPFLAGS -I$ksourcedir/include";
+	kinclude_CPPFLAGS="$kinclude_CPPFLAGS -I$ksourcedir/include/uapi -I$ksourcedir/include";
 fi;
 pkgdatadir='${datadir}/xtables';

Pablo Neira Ayuso

maintainer Applied

2013-07-24 18:45 UTC #1 lore raw

Quoted 7 lines · Phil Oester

After kernel commit 607ca46e (UAPI: (Scripted) Disintegrate include/linux), using the "--with-kernel" argument to build iptables stopped working due to the missing #ifdefs in the original files. We need to make sure the UAPI include dir is listed before the original location. Leaving both allows support for old and new kernels.
This fixes bug #833.

Applied, thanks Phil.