aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe MacDonald <joe_macdonald@mentor.com>2014-11-10 11:35:00 -0500
committerJoe MacDonald <joe_macdonald@mentor.com>2014-11-10 11:35:00 -0500
commit869aded23e5f999c4f6b3ecf0562ea9da4862c73 (patch)
tree4dbfac7ae6d10c405b6e8822e8e19a80efef1c4c
parent2bbe49e099b8826855fc7f4f1594fd01733517cc (diff)
downloadmeta-selinux-dizzy.tar.gz
meta-selinux-dizzy.tar.bz2
meta-selinux-dizzy.zip
checkpolicy: remove link against libfldizzy
An updated version of the patch to drop linking against libfl was required. Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-security/selinux/checkpolicy.inc2
-rw-r--r--recipes-security/selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch6
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 <Chong.Lu@windriver.com>
+Signed-off-by: Shrikant Bobade <Shrikant_Bobade@mentor.com>ΒΆ
+
---
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