* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flowgrind/files/, net-analyzer/flowgrind/
@ 2020-08-20 13:06 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2020-08-20 13:06 UTC (permalink / raw
To: gentoo-commits
commit: 09820b316c5ffe7ca4ef801fd1481fe967bef5b3
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 13:04:08 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 13:06:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09820b31
net-analyzer/flowgrind: Fix building with CFLAGS=-fno-common
https://github.com/flowgrind/flowgrind/pull/227
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Closes: https://bugs.gentoo.org/738186
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../files/flowgrind-0.8.0-fno-common.patch | 36 ++++++++++++++++
net-analyzer/flowgrind/flowgrind-0.8.0-r1.ebuild | 49 ++++++++++++++++++++++
2 files changed, 85 insertions(+)
diff --git a/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch b/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch
new file mode 100644
index 00000000000..60835b85881
--- /dev/null
+++ b/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch
@@ -0,0 +1,36 @@
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -86,6 +86,10 @@
+
+ int daemon_pipe[2];
+
++pthread_t daemon_thread;
++char *dump_prefix;
++char *dump_dir;
++
+ pthread_mutex_t mutex;
+ struct request *requests = 0, *requests_last = 0;
+
+--- a/src/daemon.h
++++ b/src/daemon.h
+@@ -252,7 +252,7 @@
+ int num_flows;
+ };
+
+-pthread_t daemon_thread;
++extern pthread_t daemon_thread;
+
+ /* Through this pipe we wakeup the thread from select */
+ extern int daemon_pipe[2];
+@@ -268,9 +268,8 @@
+ * large a reply can get */
+ struct report* get_reports(int *has_more);
+
+-/* FIXME: shouldn't be global? */
+-char *dump_prefix;
+-char *dump_dir;
++extern char *dump_prefix;
++extern char *dump_dir;
+
+ void *daemon_main(void* ptr);
+ void add_report(struct report* report);
diff --git a/net-analyzer/flowgrind/flowgrind-0.8.0-r1.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.0-r1.ebuild
new file mode 100644
index 00000000000..2c2e1839abf
--- /dev/null
+++ b/net-analyzer/flowgrind/flowgrind-0.8.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Network performance measurement tool"
+HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc gsl pcap"
+
+RDEPEND="
+ dev-libs/xmlrpc-c[abyss,curl]
+ sys-apps/util-linux
+ gsl? ( sci-libs/gsl )
+ pcap? ( net-libs/libpcap )
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ doc? ( app-doc/doxygen )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.8.0-fno-common.patch
+)
+
+src_configure() {
+ econf \
+ $(use_enable debug) \
+ $(use_with doc doxygen) \
+ $(use_with gsl) \
+ $(use_with pcap)
+}
+
+src_compile() {
+ default
+
+ use doc && emake html
+}
+
+src_install() {
+ default
+
+ use doc && dodoc -r doc/html
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flowgrind/files/, net-analyzer/flowgrind/
@ 2023-04-19 6:26 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-04-19 6:26 UTC (permalink / raw
To: gentoo-commits
commit: 8a9fb240ff2dc425b43dd5db1c5ad72642fb195c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 06:16:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 06:26:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a9fb240
net-analyzer/flowgrind: drop 0.8.0-r2
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/flowgrind/Manifest | 1 -
.../files/flowgrind-0.8.0-fno-common.patch | 36 ----------------
net-analyzer/flowgrind/flowgrind-0.8.0-r2.ebuild | 49 ----------------------
3 files changed, 86 deletions(-)
diff --git a/net-analyzer/flowgrind/Manifest b/net-analyzer/flowgrind/Manifest
index 92a9c6c986f8..30f4e0a2a403 100644
--- a/net-analyzer/flowgrind/Manifest
+++ b/net-analyzer/flowgrind/Manifest
@@ -1,2 +1 @@
-DIST flowgrind-0.8.0.tar.bz2 298730 BLAKE2B e924c9900d24565dc025af47d57173d828eea6a0d0bce462ab1e9cb38a14b1ac14b4148797c164212473852f5c0525161766b115b5a435fbfd673dbde8e14765 SHA512 2af250da696c4d0f613191e7a2e3084b2aa1dc995665a4164324cdb2cc56af7b000b8a2f5d5e7ac8ebbad3ae0ba4fc8eb641afe65c1a842a633c19e95ba3e65a
DIST flowgrind-0.8.2.tar.bz2 264486 BLAKE2B f0135abad43066895ce9acfb0050d12a22054d03f59e48164cde0444b3677a7581e86f25a5a967279432c95a65811135a5ce28da0f041553bca6299aabd783fa SHA512 6d1395881f45fb04b2c73bc7e01cea6610795b58f59c297577c8f30942c81334e8e95cefb2331e5e40dc5f4df64a21307a94d471113251fd3127272cd081bb7b
diff --git a/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch b/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch
deleted file mode 100644
index 60835b858816..000000000000
--- a/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -86,6 +86,10 @@
-
- int daemon_pipe[2];
-
-+pthread_t daemon_thread;
-+char *dump_prefix;
-+char *dump_dir;
-+
- pthread_mutex_t mutex;
- struct request *requests = 0, *requests_last = 0;
-
---- a/src/daemon.h
-+++ b/src/daemon.h
-@@ -252,7 +252,7 @@
- int num_flows;
- };
-
--pthread_t daemon_thread;
-+extern pthread_t daemon_thread;
-
- /* Through this pipe we wakeup the thread from select */
- extern int daemon_pipe[2];
-@@ -268,9 +268,8 @@
- * large a reply can get */
- struct report* get_reports(int *has_more);
-
--/* FIXME: shouldn't be global? */
--char *dump_prefix;
--char *dump_dir;
-+extern char *dump_prefix;
-+extern char *dump_dir;
-
- void *daemon_main(void* ptr);
- void add_report(struct report* report);
diff --git a/net-analyzer/flowgrind/flowgrind-0.8.0-r2.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.0-r2.ebuild
deleted file mode 100644
index d8639d6fa32e..000000000000
--- a/net-analyzer/flowgrind/flowgrind-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Network performance measurement tool"
-HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc gsl pcap"
-
-RDEPEND="
- dev-libs/xmlrpc-c:=[abyss,curl]
- sys-apps/util-linux
- gsl? ( sci-libs/gsl:= )
- pcap? ( net-libs/libpcap )
-"
-DEPEND="
- ${RDEPEND}
-"
-BDEPEND="
- doc? ( app-doc/doxygen )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.0-fno-common.patch
-)
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_with doc doxygen) \
- $(use_with gsl) \
- $(use_with pcap)
-}
-
-src_compile() {
- default
-
- use doc && emake html
-}
-
-src_install() {
- default
-
- use doc && dodoc -r doc/html
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-04-19 6:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-19 6:26 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flowgrind/files/, net-analyzer/flowgrind/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-08-20 13:06 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox