1 audit: Fixed swig host contamination issue
3 The audit build uses swig to generate a python wrapper.
4 Unfortunately, the swig info file references host include
5 directories. Some of these were previously noticed and
6 eliminated, but the one fixed here was not.
8 Upstream Status: pending
10 Signed-off-by: Anders Hedlund <anders.hedlund@windriver.com>
11 Signed-off-by: Joe Slater <jslater@windriver.com>
13 Index: audit-2.2.1/swig/Makefile.am
14 ===================================================================
15 --- audit-2.2.1.orig/swig/Makefile.am
16 +++ audit-2.2.1/swig/Makefile.am
17 @@ -25,6 +25,7 @@ AM_CFLAGS = -fPIC -DPIC -fno-strict-alia
18 PYLIBVER ?= python$(PYTHON_VERSION)
19 PYINC ?= /usr/include/$(PYLIBVER)
20 INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib -I$(PYINC)
21 +STDINC ?= /usr/include
22 LIBS = $(top_builddir)/lib/libaudit.la
23 pyexec_PYTHON = audit.py
24 pyexec_LTLIBRARIES = _audit.la
25 @@ -34,7 +35,7 @@ _audit_la_HEADERS: $(top_builddir)/confi
26 _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h ${top_builddir}/lib/libaudit.la
27 nodist__audit_la_SOURCES = audit_wrap.c
28 audit.py audit_wrap.c: ${srcdir}/auditswig.i
29 - swig -o audit_wrap.c -python ${INCLUDES} ${srcdir}/auditswig.i
30 + swig -o audit_wrap.c -python ${INCLUDES} -I$(STDINC) ${srcdir}/auditswig.i
32 CLEANFILES = audit.py* audit_wrap.c *~
34 Index: audit-2.2.1/swig/auditswig.i
35 ===================================================================
36 --- audit-2.2.1.orig/swig/auditswig.i
37 +++ audit-2.2.1/swig/auditswig.i
38 @@ -37,8 +37,8 @@ signed
39 #define __attribute(X) /*nothing*/
40 typedef unsigned __u32;
41 typedef unsigned uid_t;
42 -%include "/usr/include/linux/audit.h"
43 +%include "linux/audit.h"
44 #define __extension__ /*nothing*/
45 -%include "/usr/include/stdint.h"
47 %include "../lib/libaudit.h"