From 869aded23e5f999c4f6b3ecf0562ea9da4862c73 Mon Sep 17 00:00:00 2001 From: Joe MacDonald Date: Mon, 10 Nov 2014 11:35:00 -0500 Subject: checkpolicy: remove link against libfl An updated version of the patch to drop linking against libfl was required. Signed-off-by: Joe MacDonald --- recipes-security/selinux/checkpolicy.inc | 2 +- .../selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes-security/selinux/checkpolicy.inc b/recipes-security/selinux/checkpolicy.inc index 1a21680..e0c7377 100644 --- a/recipes-security/selinux/checkpolicy.inc +++ b/recipes-security/selinux/checkpolicy.inc @@ -11,7 +11,7 @@ LICENSE = "GPLv2+" DEPENDS += "libsepol libselinux bison-native flex-native" -#SRC_URI += "file://checkpolicy-Do-not-link-against-libfl.patch" +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 index 6fcf459..e19209e 100644 --- a/recipes-security/selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch +++ b/recipes-security/selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch @@ -8,6 +8,8 @@ no longer get errors about undefined references to yylex. Upstream-status: Pending Signed-off-by: Chong Lu +Signed-off-by: Shrikant Bobade ΒΆ + --- Makefile | 2 +- test/Makefile | 2 +- @@ -34,8 +36,8 @@ index 63b4d24..0f19a8a 100644 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) +-LDLIBS=-lfl $(LIBDIR)/libsepol.a -L$(LIBDIR) ++LDLIBS=$(LIBDIR)/libsepol.a -L$(LIBDIR) all: dispol dismod -- cgit v1.2.3-54-g00ecf