From 4d215a1e8111e14f6074f7abe2559800b6f4838c Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 20 May 2017 11:01:08 -0400 Subject: [PATCH] checkpolicy: remove -lfl from LDLIBSlogin When building checkpolicy/test, the linker reports the following error: cc dispol.o -lfl /usr/src/selinux/DESTDIR/usr/lib/libsepol.a -L/usr/src/selinux/DESTDIR/usr/lib -o dispol /usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/../../../../lib/libfl.so: undefined reference to `yylex' collect2: error: ld returned 1 exit status According to flex documentation (https://github.com/westes/flex/blob/master/doc/flex.texi), -lfl is used to provide an implementation for yywrap(). However every flex file now uses "%option noyywrap", which makes -lfl no longer mandatory. Remove this option from checkpolicy Makefiles. Backported from: https://patchwork.kernel.org/patch/9450549/ Original author: Nicolas Iooss Signed-off-by: Adam Duskett --- Makefile | 2 +- test/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 53a3074..875cf00 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o parse_util.o \ CHECKPOLOBJS = $(CHECKOBJS) checkpolicy.o CHECKMODOBJS = $(CHECKOBJS) checkmodule.o -LDLIBS=$(LIBDIR)/libsepol.a -lfl +LDLIBS=$(LIBDIR)/libsepol.a GENERATED=lex.yy.c y.tab.c y.tab.h diff --git a/test/Makefile b/test/Makefile index c2367e1..e7bd717 100644 --- a/test/Makefile +++ b/test/Makefile @@ -9,7 +9,7 @@ INCLUDEDIR ?= $(PREFIX)/include CFLAGS ?= -g -Wall -W -Werror -O2 -pipe override CFLAGS += -I$(INCLUDEDIR) -LDLIBS=-lfl $(LIBDIR)/libsepol.a -L$(LIBDIR) +LDLIBS=$(LIBDIR)/libsepol.a -L$(LIBDIR) all: dispol dismod -- 2.9.3