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 ADD83138334 for ; Sat, 28 Dec 2019 09:41:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B58AE0B43; Sat, 28 Dec 2019 09:41:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 4ADF9E0B43 for ; Sat, 28 Dec 2019 09:41:38 +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 D8C9134DC48 for ; Sat, 28 Dec 2019 09:41:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4DBB738 for ; Sat, 28 Dec 2019 09:41:34 +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: <1577526063.85e0c20c96c6260e927eef41fe0aae42fcf11cb6.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.29-build-system-fixes.patch sys-libs/libcap/libcap-2.29-r1.ebuild sys-libs/libcap/libcap-2.29.ebuild X-VCS-Directories: sys-libs/libcap/ sys-libs/libcap/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 85e0c20c96c6260e927eef41fe0aae42fcf11cb6 X-VCS-Branch: master Date: Sat, 28 Dec 2019 09:41:34 +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: e9a1cf0c-cc0c-4523-b2cd-03e30cb0e60b X-Archives-Hash: d4a0a9c53bbd2dcd4f5266118db0a769 commit: 85e0c20c96c6260e927eef41fe0aae42fcf11cb6 Author: Lars Wendler gentoo org> AuthorDate: Sat Dec 28 09:41:03 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Dec 28 09:41:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85e0c20c sys-libs/libcap: Don't remove libpsx.a or -lpsx fails for consumers Attempt to fix build with LTO Bug: https://bugs.gentoo.org/702516 Closes: https://bugs.gentoo.org/703912 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> .../libcap/files/libcap-2.29-build-system-fixes.patch | 17 +++++++++++++++-- .../{libcap-2.29.ebuild => libcap-2.29-r1.ebuild} | 4 +++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/sys-libs/libcap/files/libcap-2.29-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.29-build-system-fixes.patch index 910163c2612..a7751f429fd 100644 --- a/sys-libs/libcap/files/libcap-2.29-build-system-fixes.patch +++ b/sys-libs/libcap/files/libcap-2.29-build-system-fixes.patch @@ -1,4 +1,4 @@ -From 449b6cb6226086c136dd108d11471d99692812b7 Mon Sep 17 00:00:00 2001 +From 907626b63794199163778761fb56a5c89aa33e35 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 10 Feb 2016 09:47:27 +0100 Subject: [PATCH] build system fixes @@ -21,11 +21,12 @@ Forward ported from libcap-2.28 to libcap-2.29 Signed-off-by: Lars Wendler --- Make.Rules | 27 +++++++++++++++------------ + Makefile | 1 - libcap/Makefile | 7 ++++--- pam_cap/Makefile | 8 +++++--- progs/Makefile | 2 +- tests/Makefile | 8 +++++--- - 5 files changed, 30 insertions(+), 22 deletions(-) + 6 files changed, 30 insertions(+), 23 deletions(-) diff --git a/Make.Rules b/Make.Rules index e7641e7..32c57df 100644 @@ -82,6 +83,18 @@ index e7641e7..32c57df 100644 ifeq ($(GOLANG),yes) GOROOT := $(shell go env GOROOT) GOCGO := $(shell if [ "$(shell go env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi) +diff --git a/Makefile b/Makefile +index 14e29ef..f0104e0 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,7 +16,6 @@ endif + ifeq ($(GOLANG),yes) + $(MAKE) -C go $@ + endif +- $(MAKE) -C tests $@ + $(MAKE) -C progs $@ + $(MAKE) -C doc $@ + $(MAKE) -C kdebug $@ diff --git a/libcap/Makefile b/libcap/Makefile index 949cfad..a7f80ce 100644 --- a/libcap/Makefile diff --git a/sys-libs/libcap/libcap-2.29.ebuild b/sys-libs/libcap/libcap-2.29-r1.ebuild similarity index 94% rename from sys-libs/libcap/libcap-2.29.ebuild rename to sys-libs/libcap/libcap-2.29-r1.ebuild index 567940f4c71..baec266531e 100644 --- a/sys-libs/libcap/libcap-2.29.ebuild +++ b/sys-libs/libcap/libcap-2.29-r1.ebuild @@ -64,7 +64,9 @@ multilib_src_install() { gen_usr_ldscript -a cap if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die + # Don't remove libpsx.a! + # See https://bugs.gentoo.org/703912 + rm "${ED}"/usr/$(get_libdir)/libcap.a || die fi if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then