From 24b65f1bd7f9fd834066553f65c7264598d0abd2 Mon Sep 17 00:00:00 2001 From: Chong Lu Date: Thu, 3 Apr 2014 14:05:51 -0400 Subject: checkpolicy: Don't link against libfl In policy_scan.l file, we have already removed all references to yywrap by adding "%option noyywrap" statements to each flex source file that doesn't override yywrap. After this, we no longer need to link against libfl and so no longer get errors about undefined references to yylex. Signed-off-by: Chong Lu Signed-off-by: Joe MacDonald --- recipes-security/selinux/checkpolicy.inc | 2 + .../checkpolicy-Do-not-link-against-libfl.patch | 44 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 recipes-security/selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch diff --git a/recipes-security/selinux/checkpolicy.inc b/recipes-security/selinux/checkpolicy.inc index 096f938..54edc11 100644 --- a/recipes-security/selinux/checkpolicy.inc +++ b/recipes-security/selinux/checkpolicy.inc @@ -13,6 +13,8 @@ LICENSE = "GPLv2+" DEPENDS += "libsepol libselinux bison-native flex-native" +SRC_URI += "file://checkpolicy-Do-not-link-against-libfl.patch" + EXTRA_OEMAKE += "PREFIX=${D}" EXTRA_OEMAKE += "LEX='flex'" diff --git a/recipes-security/selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch b/recipes-security/selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch new file mode 100644 index 0000000..6fcf459 --- /dev/null +++ b/recipes-security/selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch @@ -0,0 +1,44 @@ +checkpolicy: Don't link against libfl + +In policy_scan.l file, we have already removed all references to yywrap by +adding "%option noyywrap" statements to each flex source file that doesn't +override yywrap. After this, we no longer need to link against libfl and so +no longer get errors about undefined references to yylex. + +Upstream-status: Pending + +Signed-off-by: Chong Lu +--- + Makefile | 2 +- + test/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index e5fae3d..14ac70e 100644 +--- a/Makefile ++++ b/Makefile +@@ -19,7 +19,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 63b4d24..0f19a8a 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 -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) ++LDLIBS=-lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) + + all: dispol dismod + +-- +1.7.9.5 + -- cgit v1.2.3-54-g00ecf