mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
Khem Raj
ee3c680c30
audit errors out due to swig munging it does with kernel headers | audit_wrap.c: In function '_wrap_audit_rule_data_buf_set': | audit_wrap.c:4701:17: error: cast specifies array type | 4701 | arg1->buf = (char [])(char *)memcpy(malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size)); | | ^ | audit_wrap.c:4701:15: error: invalid use of flexible array member | 4701 | arg1->buf = (char [])(char *)memcpy(malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size)); | | ^ | audit_wrap.c:4703:15: error: invalid use of flexible array member | 4703 | arg1->buf = 0; | | ^ These errors are due to VLAIS from kernel headers, so we copy linux/audit.h and make the needed change in local audit.h and make needed arrangements in build to use it when building audit package Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Bruce Ashfield <bruce.ashfield@gmail.com>
51 lines
2.0 KiB
Diff
51 lines
2.0 KiB
Diff
From 3d13f92c1bb293523670ba01aea7e655b00a6709 Mon Sep 17 00:00:00 2001
|
|
From: Li xin <lixin.fnst@cn.fujitsu.com>
|
|
Date: Sun, 19 Jul 2015 02:42:58 +0900
|
|
Subject: [PATCH] audit: Fixed swig host contamination issue
|
|
|
|
The audit build uses swig to generate a python wrapper.
|
|
Unfortunately, the swig info file references host include
|
|
directories. Some of these were previously noticed and
|
|
eliminated, but the one fixed here was not.
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
Signed-off-by: Anders Hedlund <anders.hedlund@windriver.com>
|
|
Signed-off-by: Joe Slater <jslater@windriver.com>
|
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
---
|
|
bindings/swig/python3/Makefile.am | 3 ++-
|
|
bindings/swig/src/auditswig.i | 2 +-
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/bindings/swig/python3/Makefile.am
|
|
+++ b/bindings/swig/python3/Makefile.am
|
|
@@ -23,6 +23,7 @@
|
|
CONFIG_CLEAN_FILES = *.loT *.rej *.orig
|
|
AM_CFLAGS = -fPIC -DPIC -fno-strict-aliasing $(PYTHON3_CFLAGS)
|
|
AM_CPPFLAGS = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES)
|
|
+STDINC ?= /usr/include
|
|
LIBS = $(top_builddir)/lib/libaudit.la
|
|
SWIG_FLAGS = -python -py3 -modern
|
|
SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES)
|
|
@@ -37,7 +38,7 @@ _audit_la_DEPENDENCIES =${top_srcdir}/li
|
|
_audit_la_LIBADD = ${top_builddir}/lib/libaudit.la
|
|
nodist__audit_la_SOURCES = audit_wrap.c
|
|
audit.py audit_wrap.c: ${srcdir}/../src/auditswig.i
|
|
- swig -o audit_wrap.c ${SWIG_FLAGS} ${SWIG_INCLUDES} ${srcdir}/../src/auditswig.i
|
|
+ swig -o audit_wrap.c ${SWIG_FLAGS} ${SWIG_INCLUDES} -I$(STDINC) ${srcdir}/../src/auditswig.i
|
|
|
|
CLEANFILES = audit.py* audit_wrap.c *~
|
|
|
|
--- a/bindings/swig/src/auditswig.i
|
|
+++ b/bindings/swig/src/auditswig.i
|
|
@@ -39,7 +39,7 @@ signed
|
|
#define __attribute(X) /*nothing*/
|
|
typedef unsigned __u32;
|
|
typedef unsigned uid_t;
|
|
-%include "/usr/include/linux/audit.h"
|
|
+%include "../lib/audit.h"
|
|
#define __extension__ /*nothing*/
|
|
%include <stdint.i>
|
|
%include "../lib/libaudit.h"
|