diff options
Diffstat (limited to 'recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch')
| -rw-r--r-- | recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch b/recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch index 725141f..46cfaaf 100644 --- a/recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch +++ b/recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 3f633e310851cb029cb4f38d9e11a3aaef8d1099 Mon Sep 17 00:00:00 2001 | 1 | From 37f3299e8f5c468fe692f36356c2c35f968b6aee Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Yang <liezhi.yang@windriver.com> | 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Thu, 18 Feb 2016 02:39:16 +0000 | 3 | Date: Thu, 18 Feb 2016 02:39:16 +0000 |
| 4 | Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc | 4 | Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc |
| @@ -6,21 +6,23 @@ Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc | |||
| 6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
| 7 | 7 | ||
| 8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 9 | 9 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |
| 10 | --- | 10 | --- |
| 11 | src/Makefile | 2 +- | 11 | src/Makefile | 1 + |
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+) |
| 13 | 13 | ||
| 14 | diff --git a/src/Makefile b/src/Makefile | 14 | diff --git a/src/Makefile b/src/Makefile |
| 15 | index a89c0f7..f304032 100644 | 15 | index 977b5c8..92a4289 100644 |
| 16 | --- a/src/Makefile | 16 | --- a/src/Makefile |
| 17 | +++ b/src/Makefile | 17 | +++ b/src/Makefile |
| 18 | @@ -148,7 +148,7 @@ $(LIBSO): $(LOBJS) | 18 | @@ -156,6 +156,7 @@ $(LIBSO): $(LOBJS) |
| 19 | ln -sf $@ $(TARGET) | ||
| 20 | 19 | ||
| 21 | $(LIBPC): $(LIBPC).in ../VERSION | 20 | $(LIBPC): $(LIBPC).in ../VERSION |
| 22 | - sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ | 21 | sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):; s:@PCRE_MODULE@:$(PCRE_MODULE):' < $< > $@ |
| 23 | + sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:${prefix}/include:' < $< > $@ | 22 | + sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:${libdir}:; s:@includedir@:${prefix}/include:; s:@PCRE_MODULE@:$(PCRE_MODULE):' < $< > $@ |
| 24 | 23 | ||
| 25 | selinuxswig_python_exception.i: ../include/selinux/selinux.h | 24 | selinuxswig_python_exception.i: ../include/selinux/selinux.h |
| 26 | bash -e exception.sh > $@ || (rm -f $@ ; false) | 25 | bash -e exception.sh > $@ || (rm -f $@ ; false) |
| 26 | -- | ||
| 27 | 2.7.4 | ||
| 28 | |||
