summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-08-02 18:27:29 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-13 09:27:37 +0100
commit65da29a913da26d62e432759857ba229182f3298 (patch)
treeb493d3d9c3d170b6191a98501ee5e0e8c58b0ff3
parentfdf7c0ed115269bc1290c194b4dad2a7c0ab8776 (diff)
downloadpoky-65da29a913da26d62e432759857ba229182f3298.tar.gz
libcap: fix build with gperf 3.1
(From OE-Core rev: e54e367e07ce7c69272693413db7f87a8629c536) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch41
-rw-r--r--meta/recipes-support/libcap/libcap_2.25.bb3
2 files changed, 43 insertions, 1 deletions
diff --git a/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch b/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch
new file mode 100644
index 0000000000..110ef902da
--- /dev/null
+++ b/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch
@@ -0,0 +1,41 @@
1From a05eba68c42222f02465d7ba376015926433c531 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 26 Jul 2017 13:37:49 +0300
4Subject: [PATCH] Fix build with gperf 3.1
5
6The generated gperf file refers to size_t which needs to be
7provided by stddef.h include. Also, adjust the makefile
8to match the declaration in the gperf file.
9
10Upstream-Status: Pending
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
13---
14 libcap/Makefile | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/libcap/Makefile b/libcap/Makefile
18index d189777..1a57206 100644
19--- a/libcap/Makefile
20+++ b/libcap/Makefile
21@@ -22,7 +22,7 @@ all: $(MINLIBNAME) $(STALIBNAME) libcap.pc
22
23 ifeq ($(BUILD_GPERF),yes)
24 USE_GPERF_OUTPUT = $(GPERF_OUTPUT)
25-INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT)
26+INCLUDE_GPERF_OUTPUT = -include stddef.h -include $(GPERF_OUTPUT)
27 endif
28
29 libcap.pc: libcap.pc.in
30@@ -41,7 +41,7 @@ cap_names.h: _makenames
31 ./_makenames > cap_names.h
32
33 $(GPERF_OUTPUT): cap_names.list.h
34- perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@
35+ perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, register size_t);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@
36
37 cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h
38 @echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h"
39--
402.13.2
41
diff --git a/meta/recipes-support/libcap/libcap_2.25.bb b/meta/recipes-support/libcap/libcap_2.25.bb
index 5c2765f343..d619a2eb4c 100644
--- a/meta/recipes-support/libcap/libcap_2.25.bb
+++ b/meta/recipes-support/libcap/libcap_2.25.bb
@@ -9,7 +9,8 @@ DEPENDS = "hostperl-runtime-native gperf-native"
9 9
10SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \ 10SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \
11 file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \ 11 file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \
12" 12 file://0001-Fix-build-with-gperf-3.1.patch \
13 "
13SRC_URI[md5sum] = "6666b839e5d46c2ad33fc8aa2ceb5f77" 14SRC_URI[md5sum] = "6666b839e5d46c2ad33fc8aa2ceb5f77"
14SRC_URI[sha256sum] = "693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162" 15SRC_URI[sha256sum] = "693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162"
15 16