Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: net-dialup/atinout/, net-dialup/atinout/files/
Date: Mon, 28 Jun 2021 10:59:05
Message-Id: 1624814795.e14b57d4679cd38fde03ff8cb5397208a5d20056.flow@gentoo
1 commit: e14b57d4679cd38fde03ff8cb5397208a5d20056
2 Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
3 AuthorDate: Sun Jun 27 17:23:03 2021 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 27 17:26:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e14b57d4
7
8 net-dialup/atinout: patched Makefile
9
10 The original one does not respect CFLAGS/LDFLAGS so with the
11 help of Sam we've patched him to make it respecting *FLAGS
12
13 Closes: https://bugs.gentoo.org/798909
14 Closes: https://bugs.gentoo.org/798903
15 Package-Manager: Portage-3.0.20, Repoman-3.0.3
16 Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
17
18 ...tinout-0.9.1.ebuild => atinout-0.9.1-r1.ebuild} | 4 ++-
19 net-dialup/atinout/files/0003-patch-makefile.patch | 40 ++++++++++++++++++++++
20 2 files changed, 43 insertions(+), 1 deletion(-)
21
22 diff --git a/net-dialup/atinout/atinout-0.9.1.ebuild b/net-dialup/atinout/atinout-0.9.1-r1.ebuild
23 similarity index 90%
24 rename from net-dialup/atinout/atinout-0.9.1.ebuild
25 rename to net-dialup/atinout/atinout-0.9.1-r1.ebuild
26 index 77408bdff..2ef99bfee 100644
27 --- a/net-dialup/atinout/atinout-0.9.1.ebuild
28 +++ b/net-dialup/atinout/atinout-0.9.1-r1.ebuild
29 @@ -16,8 +16,10 @@ KEYWORDS="~amd64 ~arm64"
30 PATCHES=(
31 "${FILESDIR}"/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
32 "${FILESDIR}"/0002-do-not-rely-on-CR-in-modem-output.patch
33 + "${FILESDIR}"/0003-patch-makefile.patch
34 )
35
36 src_compile() {
37 - CC="$(tc-getCC)" emake LDFLAGS="${LDFLAGS}"
38 + tc-export CC
39 + emake
40 }
41
42 diff --git a/net-dialup/atinout/files/0003-patch-makefile.patch b/net-dialup/atinout/files/0003-patch-makefile.patch
43 new file mode 100644
44 index 000000000..871a61efe
45 --- /dev/null
46 +++ b/net-dialup/atinout/files/0003-patch-makefile.patch
47 @@ -0,0 +1,40 @@
48 +From 404fb66abd5db4ef4b824ec67c56887773c99962 Mon Sep 17 00:00:00 2001
49 +From: Marco Scardovi <marco@××××××××.com>
50 +Date: Sun, 27 Jun 2021 18:21:15 +0200
51 +Subject: [PATCH] patch makefile
52 +
53 +Signed-off-by: Marco Scardovi <marco@××××××××.com>
54 +---
55 + Makefile | 12 +++++-------
56 + 1 file changed, 5 insertions(+), 7 deletions(-)
57 +
58 +diff --git a/Makefile b/Makefile
59 +index 1daa431..bb27d0b 100644
60 +--- a/Makefile
61 ++++ b/Makefile
62 +@@ -1,17 +1,15 @@
63 + VERSION = 0.9.1
64 +
65 +-PREFIX = /usr
66 ++PREFIX ?= /usr
67 +
68 +-CC = gcc
69 +-CFLAGS = -W -Wall -Wextra -Werror \
70 +- -DVERSION=\"$(VERSION)\" \
71 +- -g
72 +-LDFLAGS =
73 ++CC ?= gcc
74 ++CFLAGS ?= -W -Wall -Wextra -Werror -g
75 ++LDFLAGS ?=
76 +
77 + all: atinout
78 +
79 + atinout: atinout.c
80 +- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^
81 ++ $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -DVERSION=\"$(VERSION)\" $(LDFLAGS) $^
82 +
83 + clean:
84 + rm -f atinout
85 +--
86 +2.32.0
87 +