summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2017-02-01 14:41:53 +0000
committerTony Vroon <chainsaw@gentoo.org>2017-02-01 14:41:53 +0000
commit3e68f63c6dd1309dff74786854d3ceabb8476582 (patch)
treee3607d8cce9d71e04058aa1a39aadf036c413555 /sys-libs/libcap
parentdev-java/gradle-bin: Incorporate ebuild feedback from David "soap" Seifert. (diff)
downloadgentoo-3e68f63c6dd1309dff74786854d3ceabb8476582.tar.gz
gentoo-3e68f63c6dd1309dff74786854d3ceabb8476582.tar.bz2
gentoo-3e68f63c6dd1309dff74786854d3ceabb8476582.zip
sys-libs/libcap: Patch & research by Mike "floppym" Gilbert to allow compilation against gperf 3.1; ported to no-perl Makefile by me. Closes bug #604802 by dwfreed.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sys-libs/libcap')
-rw-r--r--sys-libs/libcap/files/libcap-2.25-gperf.patch17
-rw-r--r--sys-libs/libcap/libcap-2.25.ebuild1
2 files changed, 18 insertions, 0 deletions
diff --git a/sys-libs/libcap/files/libcap-2.25-gperf.patch b/sys-libs/libcap/files/libcap-2.25-gperf.patch
new file mode 100644
index 000000000000..aa67a19db554
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.25-gperf.patch
@@ -0,0 +1,17 @@
+diff -uNr libcap-2.25.ORIG/libcap/Makefile libcap-2.25/libcap/Makefile
+--- libcap-2.25.ORIG/libcap/Makefile 2017-02-01 09:58:34.966642226 +0000
++++ libcap-2.25/libcap/Makefile 2017-02-01 10:01:49.943651936 +0000
+@@ -44,11 +44,12 @@
+ ./_makenames > cap_names.h
+
+ $(GPERF_OUTPUT): cap_names.list.h
+- (printf "%b" "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"; \
++ (printf "%b" "struct __cap_token_s { const char *name; int index; };\n%%\n"; \
+ $(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \
+ gperf \
+ --ignore-case \
+ --language=ANSI-C \
++ --includes \
+ --readonly \
+ --null-strings \
+ --global-table \
diff --git a/sys-libs/libcap/libcap-2.25.ebuild b/sys-libs/libcap/libcap-2.25.ebuild
index f523bd168f1a..ad5bb12955db 100644
--- a/sys-libs/libcap/libcap-2.25.ebuild
+++ b/sys-libs/libcap/libcap-2.25.ebuild
@@ -26,6 +26,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.22-no-perl.patch
"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
"${FILESDIR}"/${PN}-2.21-include.patch
+ "${FILESDIR}"/${PN}-2.25-gperf.patch
)
src_prepare() {