From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7ACB9138334 for ; Thu, 12 Dec 2019 15:05:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8ECDAE070D; Thu, 12 Dec 2019 15:05:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5ECE4E070D for ; Thu, 12 Dec 2019 15:05:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D8C7B34D973 for ; Thu, 12 Dec 2019 15:05:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 659FF8A7 for ; Thu, 12 Dec 2019 15:05:48 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1576163144.ec45d4f4887db75d749bf8b871bbb768ebd79561.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/, sys-libs/libcap/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch sys-libs/libcap/files/libcap-2.28-header_location.patch sys-libs/libcap/libcap-2.28-r1.ebuild sys-libs/libcap/libcap-2.28.ebuild X-VCS-Directories: sys-libs/libcap/files/ sys-libs/libcap/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: ec45d4f4887db75d749bf8b871bbb768ebd79561 X-VCS-Branch: master Date: Thu, 12 Dec 2019 15:05:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 51b3faa8-f01f-4239-8e07-44ea31d0b558 X-Archives-Hash: a13b097190165982ebe7f206fd78d5aa commit: ec45d4f4887db75d749bf8b871bbb768ebd79561 Author: Lars Wendler gentoo org> AuthorDate: Thu Dec 12 15:05:35 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Dec 12 15:05:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec45d4f4 sys-libs/libcap: Revbump to adjust build system fixes Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> .../files/libcap-2.28-build-system-fixes.patch | 18 +++++----- .../libcap/files/libcap-2.28-header_location.patch | 39 ---------------------- .../{libcap-2.28.ebuild => libcap-2.28-r1.ebuild} | 1 - 3 files changed, 10 insertions(+), 48 deletions(-) diff --git a/sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch index 03455febade..ae0f2a36f6d 100644 --- a/sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch +++ b/sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch @@ -1,4 +1,4 @@ -From f65164072879ebb6b1fd6cc79a6b77804150bcc4 Mon Sep 17 00:00:00 2001 +From 9ce6d2ab1060c362178aba57b68bedca2d39cfe9 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 10 Feb 2016 09:47:27 +0100 Subject: [PATCH] build system fixes @@ -19,21 +19,20 @@ Forward ported from libcap-2.25 to libcap-2.28 Signed-off-by: Lars Wendler --- - Make.Rules | 28 +++++++++++++++------------- + Make.Rules | 30 ++++++++++++++++++------------ libcap/Makefile | 7 ++++--- pam_cap/Makefile | 8 +++++--- progs/Makefile | 2 +- - 4 files changed, 25 insertions(+), 20 deletions(-) + 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/Make.Rules b/Make.Rules -index ab4f17c..f97021d 100644 +index ab4f17c..1b659ea 100644 --- a/Make.Rules +++ b/Make.Rules -@@ -45,36 +45,38 @@ MINOR=28 - +@@ -46,35 +46,41 @@ MINOR=28 # Compilation specifics --KERNEL_HEADERS := $(topdir)/libcap/include/uapi + KERNEL_HEADERS := $(topdir)/libcap/include/uapi -IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include - -CC := gcc @@ -42,10 +41,13 @@ index ab4f17c..f97021d 100644 -BUILD_CFLAGS := $(CFLAGS) $(IPATH) -AR := ar -RANLIB := ranlib ++IPATH += -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include ++ +CC ?= gcc +CFLAGS ?= -O2 +BUILD_CC ?= $(CC) +BUILD_CFLAGS ?= $(CFLAGS) ++BUILD_CFLAGS += $(IPATH) +AR ?= ar +RANLIB ?= ranlib DEBUG = -g #-DDEBUG @@ -159,5 +161,5 @@ index 0786ad3..3abbbd9 100644 install: all mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) -- -2.24.0 +2.24.1 diff --git a/sys-libs/libcap/files/libcap-2.28-header_location.patch b/sys-libs/libcap/files/libcap-2.28-header_location.patch deleted file mode 100644 index 8b0678cab75..00000000000 --- a/sys-libs/libcap/files/libcap-2.28-header_location.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 685fcf590a4737ddd85f085d7bccc6a9687c0023 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Tue, 10 Dec 2019 11:14:57 +0100 -Subject: [PATCH] build: Fix psx_syscall.h location - ---- - tests/libcap_psx_test.c | 2 +- - tests/psx_test.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/libcap_psx_test.c b/tests/libcap_psx_test.c -index 4b09bb0..6eebdfa 100644 ---- a/tests/libcap_psx_test.c -+++ b/tests/libcap_psx_test.c -@@ -1,7 +1,7 @@ - #include - #include - #include --#include -+#include "../libcap/include/sys/psx_syscall.h" - - int main(int argc, char **argv) { - printf("hello libcap and libpsx\n"); -diff --git a/tests/psx_test.c b/tests/psx_test.c -index 92b99a0..a3191f1 100644 ---- a/tests/psx_test.c -+++ b/tests/psx_test.c -@@ -2,7 +2,7 @@ - #include - #include - #include --#include -+#include "../libcap/include/sys/psx_syscall.h" - #include - - static void say_hello_expecting(const char *title, int n, int kept) { --- -2.24.0 - diff --git a/sys-libs/libcap/libcap-2.28.ebuild b/sys-libs/libcap/libcap-2.28-r1.ebuild similarity index 97% rename from sys-libs/libcap/libcap-2.28.ebuild rename to sys-libs/libcap/libcap-2.28-r1.ebuild index ab870aa7e15..679cf0b9f26 100644 --- a/sys-libs/libcap/libcap-2.28.ebuild +++ b/sys-libs/libcap/libcap-2.28-r1.ebuild @@ -30,7 +30,6 @@ PATCHES=( "${FILESDIR}"/${PN}-2.28-no_perl.patch "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch "${FILESDIR}"/${PN}-2.21-include.patch - "${FILESDIR}"/${PN}-2.28-header_location.patch ) src_prepare() {