diff options
author | Joe MacDonald <joe_macdonald@mentor.com> | 2014-11-10 11:35:00 -0500 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2014-11-10 11:35:00 -0500 |
commit | 869aded23e5f999c4f6b3ecf0562ea9da4862c73 (patch) | |
tree | 4dbfac7ae6d10c405b6e8822e8e19a80efef1c4c | |
parent | 2bbe49e099b8826855fc7f4f1594fd01733517cc (diff) | |
download | meta-selinux-dizzy.tar.gz |
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.inc | 2 | ||||
-rw-r--r-- | recipes-security/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+" | |||
11 | 11 | ||
12 | DEPENDS += "libsepol libselinux bison-native flex-native" | 12 | DEPENDS += "libsepol libselinux bison-native flex-native" |
13 | 13 | ||
14 | #SRC_URI += "file://checkpolicy-Do-not-link-against-libfl.patch" | 14 | SRC_URI += "file://checkpolicy-Do-not-link-against-libfl.patch" |
15 | 15 | ||
16 | EXTRA_OEMAKE += "PREFIX=${D}" | 16 | EXTRA_OEMAKE += "PREFIX=${D}" |
17 | EXTRA_OEMAKE += "LEX='flex'" | 17 | 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. | |||
8 | Upstream-status: Pending | 8 | Upstream-status: Pending |
9 | 9 | ||
10 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | 10 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> |
11 | Signed-off-by: Shrikant Bobade <Shrikant_Bobade@mentor.com>ΒΆ | ||
12 | |||
11 | --- | 13 | --- |
12 | Makefile | 2 +- | 14 | Makefile | 2 +- |
13 | test/Makefile | 2 +- | 15 | test/Makefile | 2 +- |
@@ -34,8 +36,8 @@ index 63b4d24..0f19a8a 100644 | |||
34 | CFLAGS ?= -g -Wall -W -Werror -O2 -pipe | 36 | CFLAGS ?= -g -Wall -W -Werror -O2 -pipe |
35 | override CFLAGS += -I$(INCLUDEDIR) | 37 | override CFLAGS += -I$(INCLUDEDIR) |
36 | 38 | ||
37 | -LDLIBS=-lfl -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) | 39 | -LDLIBS=-lfl $(LIBDIR)/libsepol.a -L$(LIBDIR) |
38 | +LDLIBS=-lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) | 40 | +LDLIBS=$(LIBDIR)/libsepol.a -L$(LIBDIR) |
39 | 41 | ||
40 | all: dispol dismod | 42 | all: dispol dismod |
41 | 43 | ||