* [PATCH] iptables: additional include path required after UAPI changes
@ 2013-07-21 15:30 Phil Oester
2013-07-24 18:44 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Phil Oester @ 2013-07-21 15:30 UTC (permalink / raw)
To: netfilter-devel; +Cc: pablo
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
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 <kernel@linuxace.com>
[-- Attachment #2: patch-ipt-uapi --]
[-- Type: text/plain, Size: 688 bytes --]
diff --git a/configure.ac b/configure.ac
index be216b0..5ed5165 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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';
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iptables: additional include path required after UAPI changes
2013-07-21 15:30 [PATCH] iptables: additional include path required after UAPI changes Phil Oester
@ 2013-07-24 18:44 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2013-07-24 18:44 UTC (permalink / raw)
To: Phil Oester; +Cc: netfilter-devel
On Sun, Jul 21, 2013 at 08:30:49AM -0700, Phil Oester wrote:
> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-07-24 18:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-21 15:30 [PATCH] iptables: additional include path required after UAPI changes Phil Oester
2013-07-24 18:44 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).