checkpolicy: fix building with new flex

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 35 insertions, 5 deletions

diff --git a/patches/checkpolicy-2.1.11/0001-makefile-remove-host-path-from-list-of-header-search.patch b/patches/checkpolicy-2.1.11/0001-makefile-remove-host-path-from-list-of-header-search.patch
index 5e7ca3dda..5bbc85d9b 100644
--- a/patches/checkpolicy-2.1.11/0001-makefile-remove-host-path-from-list-of-header-search.patch
+++ b/patches/checkpolicy-2.1.11/0001-makefile-remove-host-path-from-list-of-header-search.patch
@@ -4,12 +4,12 @@ Subject: [PATCH] makefile: remove host path from list of header search dirs
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- Makefile      |    2 +-
- test/Makefile |    2 +-
+ Makefile      | 2 +-
+ test/Makefile | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index e5fae3d..02f7b7e 100644
+index e5fae3dfb229..02f7b7efc90e 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -12,7 +12,7 @@ YACC = bison -y
@@ -22,7 +22,7 @@ index e5fae3d..02f7b7e 100644
  CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o parse_util.o \
  	    policy_define.o
 diff --git a/test/Makefile b/test/Makefile
-index 0731e89..51d0f63 100644
+index 0731e89a641f..51d0f639bc77 100644
 --- a/test/Makefile
 +++ b/test/Makefile
 @@ -7,7 +7,7 @@ LIBDIR=$(PREFIX)/lib
diff --git a/patches/checkpolicy-2.1.11/0002-test-don-t-link-to-libfl.patch b/patches/checkpolicy-2.1.11/0002-test-don-t-link-to-libfl.patch
new file mode 100644
index 000000000..29de2f635
--- /dev/null
+++ b/patches/checkpolicy-2.1.11/0002-test-don-t-link-to-libfl.patch
@@ -0,0 +1,29 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 11 Jun 2016 16:29:29 +0200
+Subject: [PATCH] test: don't link to libfl
+
+It is not needed and newer version of libfl can cause build errors:
+
+[...]/lib/libfl.so: undefined reference to `yylex'
+collect2: error: ld returned 1 exit status
+<builtin>: recipe for target 'dispol' failed
+make[2]: *** [dispol] Error 1
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ test/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index 51d0f639bc77..78c6614a0afb 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -9,7 +9,7 @@ INCLUDEDIR ?= $(PREFIX)/include
+ CFLAGS ?= -g -Wall -W -Werror -O2 -pipe
+ override CFLAGS +=
+ 
+-LDLIBS=-lfl -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR)
++LDLIBS=-lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR)
+ 
+ all: dispol dismod
+ 
diff --git a/patches/checkpolicy-2.1.11/series b/patches/checkpolicy-2.1.11/series
index 9c6265af9..9a6f2a8d6 100644
--- a/patches/checkpolicy-2.1.11/series
+++ b/patches/checkpolicy-2.1.11/series
@@ -1,4 +1,5 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
 0001-makefile-remove-host-path-from-list-of-header-search.patch
-# 750384bfff2c0909584851a365cba458  - git-ptx-patches magic
+0002-test-don-t-link-to-libfl.patch
+# 69f6720aa9874ad92ea336c2002cb345  - git-ptx-patches magic