1 |
commit: ad78c19ac37adfc6e36779dfe1d762f87c671a66 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 31 22:45:30 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 31 22:45:53 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad78c19a |
7 |
|
8 |
net-analyzer/iftop: Fix CFLAGS=-fno-common |
9 |
|
10 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
11 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=707420 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
.../iftop/files/iftop-1.0_pre4-fno-common.patch | 56 ++++++++++++++++++++++ |
15 |
net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild | 3 +- |
16 |
net-analyzer/iftop/iftop-9999999.ebuild | 3 +- |
17 |
3 files changed, 60 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-fno-common.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-fno-common.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..13e0f1058f4 |
22 |
--- /dev/null |
23 |
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-fno-common.patch |
24 |
@@ -0,0 +1,56 @@ |
25 |
+--- a/ui_common.c |
26 |
++++ b/ui_common.c |
27 |
+@@ -28,6 +28,13 @@ |
28 |
+ extern int history_pos; |
29 |
+ extern int history_len; |
30 |
+ |
31 |
++sorted_list_type screen_list; |
32 |
++host_pair_line totals; |
33 |
++int peaksent, peakrecv, peaktotal; |
34 |
++history_type history_totals; |
35 |
++hash_type* screen_hash; |
36 |
++hash_type* service_hash; |
37 |
++ |
38 |
+ /* |
39 |
+ * Compare two screen lines based on bandwidth. Start comparing from the |
40 |
+ * specified column |
41 |
+--- a/ui_common.h |
42 |
++++ b/ui_common.h |
43 |
+@@ -33,12 +33,12 @@ |
44 |
+ |
45 |
+ extern options_t options; |
46 |
+ |
47 |
+-sorted_list_type screen_list; |
48 |
+-host_pair_line totals; |
49 |
+-int peaksent, peakrecv, peaktotal; |
50 |
++extern sorted_list_type screen_list; |
51 |
++extern host_pair_line totals; |
52 |
++extern int peaksent, peakrecv, peaktotal; |
53 |
+ extern history_type history_totals; |
54 |
+-hash_type* screen_hash; |
55 |
+-hash_type* service_hash; |
56 |
++extern hash_type* screen_hash; |
57 |
++extern hash_type* service_hash; |
58 |
+ |
59 |
+ void analyse_data(void); |
60 |
+ void screen_list_init(void); |
61 |
+--- a/ui.c |
62 |
++++ b/ui.c |
63 |
+@@ -253,7 +253,6 @@ |
64 |
+ } |
65 |
+ } |
66 |
+ |
67 |
+-extern history_type history_totals; |
68 |
+ |
69 |
+ |
70 |
+ void ui_print() { |
71 |
+--- a/iftop.c |
72 |
++++ b/iftop.c |
73 |
+@@ -66,7 +66,6 @@ |
74 |
+ extern options_t options; |
75 |
+ |
76 |
+ hash_type* history; |
77 |
+-history_type history_totals; |
78 |
+ time_t last_timestamp; |
79 |
+ time_t first_timestamp; |
80 |
+ int history_pos = 0; |
81 |
|
82 |
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild |
83 |
index 8221ce61ddb..3f9d11ed9b4 100644 |
84 |
--- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild |
85 |
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild |
86 |
@@ -1,4 +1,4 @@ |
87 |
-# Copyright 1999-2019 Gentoo Authors |
88 |
+# Copyright 1999-2020 Gentoo Authors |
89 |
# Distributed under the terms of the GNU General Public License v2 |
90 |
|
91 |
EAPI=7 |
92 |
@@ -26,6 +26,7 @@ PATCHES=( |
93 |
"${FILESDIR}"/${PN}-1.0_pre4-tsent-set-but-not-used.patch |
94 |
"${FILESDIR}"/${PN}-1.0_pre4-ip6.arpa.patch |
95 |
"${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch |
96 |
+ "${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch |
97 |
) |
98 |
S="${WORKDIR}"/${P/_/} |
99 |
|
100 |
|
101 |
diff --git a/net-analyzer/iftop/iftop-9999999.ebuild b/net-analyzer/iftop/iftop-9999999.ebuild |
102 |
index 5e2de84db47..f67befd3bc2 100644 |
103 |
--- a/net-analyzer/iftop/iftop-9999999.ebuild |
104 |
+++ b/net-analyzer/iftop/iftop-9999999.ebuild |
105 |
@@ -1,4 +1,4 @@ |
106 |
-# Copyright 1999-2019 Gentoo Authors |
107 |
+# Copyright 1999-2020 Gentoo Authors |
108 |
# Distributed under the terms of the GNU General Public License v2 |
109 |
|
110 |
EAPI=7 |
111 |
@@ -25,6 +25,7 @@ PATCHES=( |
112 |
"${FILESDIR}"/${PN}-1.0_pre4-configure.ac.patch |
113 |
"${FILESDIR}"/${PN}-1.0_pre4-Makefile.am.patch |
114 |
"${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch |
115 |
+ "${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch |
116 |
) |
117 |
|
118 |
src_prepare() { |