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 5EE10138334 for ; Fri, 13 Dec 2019 09:27:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97F1BE041F; Fri, 13 Dec 2019 09:27:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 72A79E041F for ; Fri, 13 Dec 2019 09:27:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 5CAF234D835 for ; Fri, 13 Dec 2019 09:27:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 055838B1 for ; Fri, 13 Dec 2019 09:27:16 +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: <1576229232.d6502cd58680cab758144bfe51ec6c5556179695.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcap/files/libcap-2.28-build-system-fixes.patch X-VCS-Directories: sys-libs/libcap/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: d6502cd58680cab758144bfe51ec6c5556179695 X-VCS-Branch: master Date: Fri, 13 Dec 2019 09:27:16 +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: 56198bde-7184-49be-af81-3062af315f8c X-Archives-Hash: c279842bf53390da7b2095b1d4bf9dc6 commit: d6502cd58680cab758144bfe51ec6c5556179695 Author: Lars Wendler gentoo org> AuthorDate: Fri Dec 13 09:26:26 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Dec 13 09:27:12 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6502cd5 sys-libs/libcap: Improved 2.28-build-system-fixes.patch 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 | 47 ++++++++++++++++++---- 1 file changed, 39 insertions(+), 8 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 ae0f2a36f6d..3c2ef3d2214 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 9ce6d2ab1060c362178aba57b68bedca2d39cfe9 Mon Sep 17 00:00:00 2001 +From 95e48927b0c3a5e817a41c03d977fbf2e7083940 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,17 +19,18 @@ Forward ported from libcap-2.25 to libcap-2.28 Signed-off-by: Lars Wendler --- - Make.Rules | 30 ++++++++++++++++++------------ + Make.Rules | 27 +++++++++++++++------------ libcap/Makefile | 7 ++++--- pam_cap/Makefile | 8 +++++--- progs/Makefile | 2 +- - 4 files changed, 28 insertions(+), 19 deletions(-) + tests/Makefile | 8 +++++--- + 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/Make.Rules b/Make.Rules -index ab4f17c..1b659ea 100644 +index ab4f17c..bd8f73c 100644 --- a/Make.Rules +++ b/Make.Rules -@@ -46,35 +46,41 @@ MINOR=28 +@@ -46,35 +46,38 @@ MINOR=28 # Compilation specifics KERNEL_HEADERS := $(topdir)/libcap/include/uapi @@ -41,13 +42,11 @@ index ab4f17c..1b659ea 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 @@ -64,7 +63,6 @@ index ab4f17c..1b659ea 100644 BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) -SYSTEM_HEADERS = /usr/include -+KERNEL_HEADERS = $(topdir)/libcap/include/uapi +LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include +LIBCAP_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +CPPFLAGS += $(LIBCAP_CPPFLAGS) @@ -160,6 +158,39 @@ index 0786ad3..3abbbd9 100644 install: all mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) +diff --git a/tests/Makefile b/tests/Makefile +index b16bdcd..dfed90e 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -5,6 +5,8 @@ topdir=$(shell pwd)/.. + include ../Make.Rules + # + ++CFLAGS += -fPIC ++ + all: run_psx_test run_libcap_psx_test + + install: all +@@ -14,16 +16,16 @@ run_psx_test: psx_test psx_test_wrap + ./psx_test_wrap + + psx_test: psx_test.c +- $(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB) ++ $(CC) $(CFLAGS) $(CPPFLAGS) -DNOWRAP $< -o $@ $(LIBPSXLIB) + + psx_test_wrap: psx_test.c +- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create ++ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create + + run_libcap_psx_test: libcap_psx_test + ./libcap_psx_test + + libcap_psx_test: libcap_psx_test.c +- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static ++ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static + + clean: + rm -f psx_test psx_test_wrap libcap_psx_test -- 2.24.1