Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/gatling/, www-servers/gatling/files/
Date: Sat, 28 Nov 2020 19:41:57
Message-Id: 1606592488.e3576b0b403212275e8779457e127522b210da8c.sping@gentoo
1 commit: e3576b0b403212275e8779457e127522b210da8c
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 28 19:39:01 2020 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 28 19:41:28 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3576b0b
7
8 www-servers/gatling: Respect variable AR
9
10 Closes: https://bugs.gentoo.org/756850
11 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
12 Package-Manager: Portage-3.0.0, Repoman-2.3.23
13
14 www-servers/gatling/files/gatling-0.15-ar.patch | 30 +++++++++++++++++++++++++
15 www-servers/gatling/gatling-0.15.ebuild | 1 +
16 2 files changed, 31 insertions(+)
17
18 diff --git a/www-servers/gatling/files/gatling-0.15-ar.patch b/www-servers/gatling/files/gatling-0.15-ar.patch
19 new file mode 100644
20 index 00000000000..84b13293e42
21 --- /dev/null
22 +++ b/www-servers/gatling/files/gatling-0.15-ar.patch
23 @@ -0,0 +1,30 @@
24 +From 64933921d28aa96cbece18e43723117661a8056d Mon Sep 17 00:00:00 2001
25 +From: Sebastian Pipping <sebastian@×××××××.org>
26 +Date: Sat, 28 Nov 2020 20:33:21 +0100
27 +Subject: [PATCH] GNUmakefile: Respect variable AR
28 +
29 +GNU make comes with AR predefined:
30 +$ make -f <(echo $'.PHONY: all\nall:\n\t@echo "AR is \\"$(AR)\\"."')
31 +AR is "ar".
32 +
33 +Original bug report at https://bugs.gentoo.org/756850
34 +---
35 + GNUmakefile | 2 +-
36 + 1 file changed, 1 insertion(+), 1 deletion(-)
37 +
38 +diff --git a/GNUmakefile b/GNUmakefile
39 +index 6af7b35..e6b32fe 100644
40 +--- a/GNUmakefile
41 ++++ b/GNUmakefile
42 +@@ -195,7 +195,7 @@ dummy.c:
43 + touch $@
44 +
45 + libsocketkludge.a: libsocket libiconv dummy.o
46 +- ar q $@ dummy.o
47 ++ $(AR) q $@ dummy.o
48 + -ranlib $@
49 +
50 + LDLIBS+=`cat libsocket libiconv libcrypt`
51 +--
52 +2.27.0
53 +
54
55 diff --git a/www-servers/gatling/gatling-0.15.ebuild b/www-servers/gatling/gatling-0.15.ebuild
56 index e59507c318f..c18fb7fe868 100644
57 --- a/www-servers/gatling/gatling-0.15.ebuild
58 +++ b/www-servers/gatling/gatling-0.15.ebuild
59 @@ -25,6 +25,7 @@ RDEPEND="${DEPEND}"
60
61 PATCHES=(
62 "${FILESDIR}/${PN}-0.13-compile.patch"
63 + "${FILESDIR}/${P}-ar.patch"
64 "${FILESDIR}/${P}-gcc10.patch"
65 )