From f6f730df2127512b772df7268d185349e9e87ba2 Mon Sep 17 00:00:00 2001 From: "Kazushi (Jam) Marukawa" <jam@pobox.com> Date: Sun, 30 Jul 2017 12:10:55 +0900 Subject: [PATCH] Change libcap.rb to make it work with gperf 3.1 --- packages/libcap.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/libcap.rb b/packages/libcap.rb index 2594bcff..74c85593 100644 --- a/packages/libcap.rb +++ b/packages/libcap.rb @@ -7,7 +7,13 @@ class Libcap < Package source_url 'https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.25.tar.xz' source_sha256 '693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162' + depends_on 'gperf' => :build + depends_on 'perl' => :build + def self.build + # add includes option to make it work with gperf-3.1 + system 'sed -e "/gperf --/s/gperf --/gperf --includes --/" -e "/gperf --/s/cap_lookup_name(/cap_dummy(/" -i libcap/Makefile' + # change the path to ld system 'sed -i "s,/usr/bin/ld,/usr/local/bin/ld,g" Make.Rules' # change prefix @@ -16,12 +22,10 @@ class Libcap < Package system 'sed -i "s,^exec_prefix=,exec_prefix=\$(prefix)," Make.Rules' # http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch system 'sed -i "s,^\#ifdef VFS_CAP_U32,\#if defined (VFS_CAP_U32) \&\& defined (XATTR_NAME_CAPS),g" libcap/cap_file.c' - # only root user can setcap - system 'sed -i "s,\$(FAKEROOT)\$(SBINDIR)/setcap,sudo \$(FAKEROOT)\$(SBINDIR)/setcap," progs/Makefile' system 'make' end def self.install - system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" + system "make", "RAISE_SETFCAP=no", "DESTDIR=#{CREW_DEST_DIR}", "install" end end -- 2.30.9