diff options
| author |   David Seifert <soap@gentoo.org> | 2021-08-03 16:17:04 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2021-08-03 16:17:04 +0200 |
| commit | 2d5296df85f652c9c0f3dbf29aeaccedb4d43588 (patch) | |
| tree | 45be718cf249b3424896c08aa30cf33a219ce1bc /sys-libs/libcap | |
| parent | net-p2p/ktorrent: Fix tests (diff) | |
| download | gentoo-2d5296df85f652c9c0f3dbf29aeaccedb4d43588.tar.gz gentoo-2d5296df85f652c9c0f3dbf29aeaccedb4d43588.tar.bz2 gentoo-2d5296df85f652c9c0f3dbf29aeaccedb4d43588.zip | |
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@gentoo.org>
Diffstat (limited to 'sys-libs/libcap')
| -rw-r--r-- | sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch | 17 | ||||
| -rw-r--r-- | 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 3c9bf03f397f..2d6b441c485d 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 cd7de80ecb47..6dc8e00f317b 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[@]}" "$@" } |