1 |
commit: e18f1d984044423ed6ac39b6bb76a831d566328e |
2 |
Author: Cédric Krier <cedk <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 20 10:52:02 2022 +0000 |
4 |
Commit: Cédric Krier <cedk <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 20 10:52:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e18f1d98 |
7 |
|
8 |
net-news/sfeed: Set RANLIB and AR and patch for LDFLAGS |
9 |
|
10 |
Closes: https://bugs.gentoo.org/833788 |
11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
12 |
Signed-off-by: Cédric Krier <cedk <AT> gentoo.org> |
13 |
|
14 |
net-news/sfeed/files/sfeed-1.2-ldflags.patch | 20 ++++++++++++++++++++ |
15 |
net-news/sfeed/sfeed-1.2.ebuild | 18 +++++++++--------- |
16 |
2 files changed, 29 insertions(+), 9 deletions(-) |
17 |
|
18 |
diff --git a/net-news/sfeed/files/sfeed-1.2-ldflags.patch b/net-news/sfeed/files/sfeed-1.2-ldflags.patch |
19 |
new file mode 100644 |
20 |
index 000000000000..51f712976e9a |
21 |
--- /dev/null |
22 |
+++ b/net-news/sfeed/files/sfeed-1.2-ldflags.patch |
23 |
@@ -0,0 +1,20 @@ |
24 |
+diff -ru sfeed-1.2.orig/Makefile sfeed-1.2/Makefile |
25 |
+--- sfeed-1.2.orig/Makefile 2022-02-20 11:43:35.164358731 +0100 |
26 |
++++ sfeed-1.2/Makefile 2022-02-20 11:43:45.874495281 +0100 |
27 |
+@@ -27,14 +27,14 @@ |
28 |
+ SFEED_CURSES_CFLAGS = ${CFLAGS} |
29 |
+ SFEED_CURSES_CPPFLAGS = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -D_BSD_SOURCE \ |
30 |
+ -DSFEED_THEME=\"themes/${SFEED_THEME}.h\" ${SFEED_CPPFLAGS} |
31 |
+-SFEED_CURSES_LDFLAGS = ${LDFLAGS} -lcurses |
32 |
++#SFEED_CURSES_LDFLAGS = ${LDFLAGS} -lcurses |
33 |
+ |
34 |
+ # Linux: some distros use ncurses and require -lncurses. |
35 |
+ #SFEED_CURSES_LDFLAGS = ${LDFLAGS} -lncurses |
36 |
+ |
37 |
+ # Gentoo Linux: some distros might also require -ltinfo and -D_DEFAULT_SOURCE |
38 |
+ # to prevent warnings about feature test macros. |
39 |
+-#SFEED_CURSES_LDFLAGS = ${LDFLAGS} -lcurses -ltinfo |
40 |
++SFEED_CURSES_LDFLAGS = ${LDFLAGS} -lcurses -ltinfo |
41 |
+ |
42 |
+ # FreeBSD: unset feature test macros for SIGWINCH etc. |
43 |
+ #SFEED_CURSES_CPPFLAGS = |
44 |
|
45 |
diff --git a/net-news/sfeed/sfeed-1.2.ebuild b/net-news/sfeed/sfeed-1.2.ebuild |
46 |
index d4f43e5c5c2b..f70410c8c920 100644 |
47 |
--- a/net-news/sfeed/sfeed-1.2.ebuild |
48 |
+++ b/net-news/sfeed/sfeed-1.2.ebuild |
49 |
@@ -25,16 +25,16 @@ RDEPEND="${DEPEND} |
50 |
x11-misc/xdg-utils" |
51 |
BDEPEND="" |
52 |
|
53 |
+PATCHES=( |
54 |
+ "${FILESDIR}/${PN}-1.2-ldflags.patch" |
55 |
+) |
56 |
+ |
57 |
src_compile() { |
58 |
- if use ncurses; then |
59 |
- emake \ |
60 |
- CC=$(tc-getCC) \ |
61 |
- LDFLAGS="$LDFLAGS -lcurses -ltinfo" |
62 |
- else |
63 |
- emake \ |
64 |
- CC=$(tc-getCC) \ |
65 |
- SFEED_CURSES="" |
66 |
- fi |
67 |
+ emake \ |
68 |
+ CC=$(tc-getCC) \ |
69 |
+ RANLIB=$(tc-getRANLIB) \ |
70 |
+ AR=$(tc-getAR) \ |
71 |
+ SFEED_CURSES=$(usex ncurses "sfeed_curses" "") |
72 |
} |
73 |
|
74 |
src_install() { |