public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/, sys-libs/libcap/files/
Date: Tue,  3 Aug 2021 14:17:18 +0000 (UTC)	[thread overview]
Message-ID: <1628000224.2d5296df85f652c9c0f3dbf29aeaccedb4d43588.soap@gentoo> (raw)

commit:     2d5296df85f652c9c0f3dbf29aeaccedb4d43588
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  3 14:17:04 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Aug  3 14:17:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d5296df

sys-libs/libcap: proper passing of objcopy to build system

Should be a proper fix, not just a rough attempt, as I've tested
via moving the binary away and all looks good.

Closes: https://bugs.gentoo.org/806274
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../libcap/files/libcap-2.52-build-system-fixes.patch   | 17 ++++++++++-------
 sys-libs/libcap/libcap-2.52.ebuild                      |  3 ---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch
index 3c9bf03f397..2d6b441c485 100644
--- a/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch
+++ b/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch
@@ -42,24 +42,27 @@ diff --git a/Make.Rules b/Make.Rules
 index 8f7906c..fea4c78 100644
 --- a/Make.Rules
 +++ b/Make.Rules
-@@ -52,7 +52,6 @@ GOMAJOR=1
+@@ -52,18 +52,13 @@ GOMAJOR=1
  # Compilation specifics
  
  KERNEL_HEADERS := $(topdir)/libcap/include/uapi
 -IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
  
- CC := $(CROSS_COMPILE)gcc
+-CC := $(CROSS_COMPILE)gcc
  DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-@@ -60,7 +59,7 @@ COPTS ?= -O2
+ COPTS ?= -O2
  CFLAGS ?= $(COPTS) $(DEFINES)
  BUILD_CC ?= $(CC)
  BUILD_COPTS ?= -O2
 -BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH)
+-AR := $(CROSS_COMPILE)ar
+-RANLIB := $(CROSS_COMPILE)ranlib
+-OBJCOPY := $(CROSS_COMPILE)objcopy
 +BUILD_CFLAGS ?= $(CFLAGS)
- AR := $(CROSS_COMPILE)ar
- RANLIB := $(CROSS_COMPILE)ranlib
- OBJCOPY := $(CROSS_COMPILE)objcopy
-@@ -77,10 +76,13 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx $(PSXLINKFLAGS)
+ DEBUG = -g #-DDEBUG
+ WARNINGS=-Wall -Wwrite-strings \
+         -Wpointer-arith -Wcast-qual -Wcast-align \
+@@ -77,10 +72,13 @@
  
  BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
  

diff --git a/sys-libs/libcap/libcap-2.52.ebuild b/sys-libs/libcap/libcap-2.52.ebuild
index cd7de80ecb4..6dc8e00f317 100644
--- a/sys-libs/libcap/libcap-2.52.ebuild
+++ b/sys-libs/libcap/libcap-2.52.ebuild
@@ -47,9 +47,6 @@ run_emake() {
 		PAM_CAP="$(usex pam yes no)"
 		DYNAMIC=yes
 		GOLANG=no
-		CC="$(tc-getCC)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
 	)
 	emake "${args[@]}" "$@"
 }


             reply	other threads:[~2021-08-03 14:17 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-03 14:17 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-01-04 11:21 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/, sys-libs/libcap/files/ David Seifert
2021-12-14  0:44 Sam James
2021-11-20  8:29 Sam James
2021-08-30 21:35 Sam James
2021-08-30  6:12 Sam James
2021-08-03 10:27 Lars Wendler
2021-05-25 14:19 Lars Wendler
2021-02-05 10:59 Lars Wendler
2020-12-13 14:06 Lars Wendler
2020-10-08 22:53 Thomas Deutschmann
2020-07-13  9:10 Lars Wendler
2020-07-06 18:17 Lars Wendler
2020-05-05  8:25 Lars Wendler
2020-05-05  8:25 Lars Wendler
2020-01-17 14:58 Lars Wendler
2019-12-29  9:40 Lars Wendler
2019-12-28  9:41 Lars Wendler
2019-12-26 12:27 Lars Wendler
2019-12-12 15:05 Lars Wendler
2018-11-21 10:22 Lars Wendler
2018-07-04  8:43 Lars Wendler
2017-02-09 16:04 Mike Frysinger
2016-02-10  9:05 Lars Wendler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1628000224.2d5296df85f652c9c0f3dbf29aeaccedb4d43588.soap@gentoo \
    --to=soap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox