Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/irssistats/, net-irc/irssistats/files/
Date: Fri, 30 Oct 2020 22:32:16
Message-Id: 1604097127.0f642cf46a0e86a99c1be9cbff985b2b5a272143.monsieurp@gentoo
1 commit: 0f642cf46a0e86a99c1be9cbff985b2b5a272143
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 30 22:31:56 2020 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 30 22:32:07 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f642cf4
7
8 net-irc/irssistats: honor LDFLAGS.
9
10 Closes: https://bugs.gentoo.org/740704
11 Package-Manager: Portage-3.0.8, Repoman-3.0.2
12 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
13
14 .../files/irssistats-0.75-Makefile.patch | 26 ++++++++++++++++++++++
15 net-irc/irssistats/irssistats-0.75-r1.ebuild | 9 ++++++--
16 2 files changed, 33 insertions(+), 2 deletions(-)
17
18 diff --git a/net-irc/irssistats/files/irssistats-0.75-Makefile.patch b/net-irc/irssistats/files/irssistats-0.75-Makefile.patch
19 new file mode 100644
20 index 00000000000..ac91c7deb51
21 --- /dev/null
22 +++ b/net-irc/irssistats/files/irssistats-0.75-Makefile.patch
23 @@ -0,0 +1,26 @@
24 +--- a/Makefile 2020-10-30 22:07:33.519994135 -0000
25 ++++ b/Makefile 2020-10-30 22:26:46.042808724 -0000
26 +@@ -1,17 +1,18 @@
27 +-PRE = /usr/local
28 ++CC = gcc
29 ++CFLAGS ?= -O2 -Wall
30 ++PRE = /usr
31 + BIN = $(PRE)/bin
32 + DAT = $(PRE)/share/irssistats/data
33 + DOC = $(PRE)/share/doc/irssistats
34 + MAN = $(PRE)/share/man/man1
35 +-CFLAGS ?= -O2
36 +
37 +-irssistats:irssistats.c
38 +- gcc $(CFLAGS) -o irssistats irssistats.c
39 ++irssistats: irssistats.c
40 ++ $(CC) $(CFLAGS) -o irssistats irssistats.c $(LDFLAGS)
41 +
42 + clean:
43 + rm -f irssistats
44 +
45 +-install:irssistats
46 ++install: irssistats
47 + mkdir -p $(BIN) $(DAT) $(DOC) $(MAN)
48 + cp -f irssistats $(BIN)
49 + cp -f data/* $(DAT)
50
51 diff --git a/net-irc/irssistats/irssistats-0.75-r1.ebuild b/net-irc/irssistats/irssistats-0.75-r1.ebuild
52 index 3f7fd1cb742..0a674f4d68c 100644
53 --- a/net-irc/irssistats/irssistats-0.75-r1.ebuild
54 +++ b/net-irc/irssistats/irssistats-0.75-r1.ebuild
55 @@ -1,4 +1,4 @@
56 -# Copyright 1999-2019 Gentoo Authors
57 +# Copyright 1999-2020 Gentoo Authors
58 # Distributed under the terms of the GNU General Public License v2
59
60 EAPI=6
61 @@ -16,8 +16,13 @@ KEYWORDS="amd64 ppc sparc x86"
62
63 DEPEND="net-irc/irssi"
64
65 +src_prepare() {
66 + default
67 + eapply "${FILESDIR}/${P}-Makefile.patch"
68 +}
69 +
70 src_compile() {
71 - $(tc-getCC) -o irssistats ${CFLAGS} ${LDFLAGS} irssistats.c
72 + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
73 }
74
75 src_install() {