Merge "move GPLv2 logic into agl-gplv2 feature"
[AGL/meta-agl.git] / meta-security / recipes-security / audit / audit / audit-python.patch
1 Remove hard coded python include directory
2
3 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
4
5 diff -ur audit-2.1.3.orig/bindings/python/Makefile.am audit-2.1.3/bindings/python/Makefile.am
6 --- audit-2.1.3.orig/bindings/python/Makefile.am        2011-08-15 12:31:01.000000000 -0500
7 +++ audit-2.1.3/bindings/python/Makefile.am     2012-01-30 12:19:54.533959225 -0600
8 @@ -25,7 +25,9 @@
9  
10  pyexec_LTLIBRARIES = auparse.la
11  
12 +PYINC ?= /usr/include/python$(PYTHON_VERSION)
13 +
14  auparse_la_SOURCES = auparse_python.c
15 -auparse_la_CPPFLAGS = -I$(top_srcdir)/auparse $(AM_CPPFLAGS) -I/usr/include/python$(PYTHON_VERSION) -fno-strict-aliasing
16 +auparse_la_CPPFLAGS = -I$(top_srcdir)/auparse $(AM_CPPFLAGS) -I$(PYINC) -fno-strict-aliasing
17  auparse_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
18  auparse_la_LIBADD = ../../auparse/libauparse.la ../../lib/libaudit.la
19 diff -ur audit-2.1.3.orig/swig/Makefile.am audit-2.1.3/swig/Makefile.am
20 --- audit-2.1.3.orig/swig/Makefile.am   2011-08-15 12:31:03.000000000 -0500
21 +++ audit-2.1.3/swig/Makefile.am        2012-01-30 12:28:09.574834697 -0600
22 @@ -23,7 +23,8 @@
23  CONFIG_CLEAN_FILES = *.loT *.rej *.orig
24  AM_CFLAGS = -fPIC -DPIC -fno-strict-aliasing
25  PYLIBVER ?= python$(PYTHON_VERSION)
26 -INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib -I/usr/include/$(PYLIBVER)
27 +PYINC ?= /usr/include/$(PYLIBVER)
28 +INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib -I$(PYINC)
29  LIBS = $(top_builddir)/lib/libaudit.la
30  pyexec_PYTHON = audit.py
31  pyexec_LTLIBRARIES = _audit.la