1 |
commit: f40658bc7798d20eb5fb9b698a249ccbe92a4614 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 31 04:53:37 2016 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 31 04:54:20 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40658bc |
7 |
|
8 |
net-libs/libtrace: Version bump. |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
net-libs/libtrace/Manifest | 1 + |
13 |
.../files/libtrace-4.0.0-no-examples.patch | 10 ++++ |
14 |
.../libtrace/files/libtrace-4.0.0-with-numa.patch | 27 ++++++++++ |
15 |
net-libs/libtrace/libtrace-4.0.0_beta.ebuild | 58 ++++++++++++++++++++++ |
16 |
net-libs/libtrace/metadata.xml | 3 ++ |
17 |
5 files changed, 99 insertions(+) |
18 |
|
19 |
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest |
20 |
index aadc21c..ce89ee5 100644 |
21 |
--- a/net-libs/libtrace/Manifest |
22 |
+++ b/net-libs/libtrace/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
DIST libtrace-3.0.22.tar.bz2 642284 SHA256 b8bbaa2054c69cc8f93066143e2601c09c8ed56e75c6e5e4e2c115d07952f8f8 SHA512 6a9055c6c7f7f65f08eacf111abf72418eb4546ff252362977e4f81a4e6d3a36bf7e2ed6ea988cd6baf6b315d6a5fc1691de364fc7d56e561ae230da77810113 WHIRLPOOL 4c1c6c3faef2049466bd8ad07ea9b1c0462ff78c91278b7ed1e9f0938c16d871c6215b24dbed2a85a942e9a63856a15d082c82174dc40d8eec081d92e33dc8d8 |
25 |
+DIST libtrace-4.0.0-beta.tar.gz 901978 SHA256 d4b75ff078342a065690f9d90fc57d9445143dd4c2e70b1c32d1345101211c50 SHA512 d5a52dd940d14198da0a257e8786be6b00831f30e9528543eb3ac6ab021451c5fd0d47081aaabaeefe23494e0c144fc60c0c9c2a15a14ce3770999afce0a4629 WHIRLPOOL 5e8b7d72a4d709c8973ab83341d229387e2d1e9974e598b86f0f69bc35f249033ca901f4017ebe5f54753d7ffa2348b5f26ded908df14e08dae5bfd88d1a6ed6 |
26 |
|
27 |
diff --git a/net-libs/libtrace/files/libtrace-4.0.0-no-examples.patch b/net-libs/libtrace/files/libtrace-4.0.0-no-examples.patch |
28 |
new file mode 100644 |
29 |
index 00000000..8467ffd |
30 |
--- /dev/null |
31 |
+++ b/net-libs/libtrace/files/libtrace-4.0.0-no-examples.patch |
32 |
@@ -0,0 +1,10 @@ |
33 |
+--- a/Makefile.am |
34 |
++++ b/Makefile.am |
35 |
+@@ -1,6 +1,6 @@ |
36 |
+ LIBPACKETDUMP_DIR = libpacketdump |
37 |
+ TOOLS_DIR = tools |
38 |
+-SUBDIRS = lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs examples |
39 |
++SUBDIRS = lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs |
40 |
+ |
41 |
+ ACLOCAL_AMFLAGS = -I m4 |
42 |
+ AUTOMAKE_OPTIONS = 1.9 foreign |
43 |
|
44 |
diff --git a/net-libs/libtrace/files/libtrace-4.0.0-with-numa.patch b/net-libs/libtrace/files/libtrace-4.0.0-with-numa.patch |
45 |
new file mode 100644 |
46 |
index 00000000..54e9f54 |
47 |
--- /dev/null |
48 |
+++ b/net-libs/libtrace/files/libtrace-4.0.0-with-numa.patch |
49 |
@@ -0,0 +1,27 @@ |
50 |
+--- a/configure.in |
51 |
++++ b/configure.in |
52 |
+@@ -431,7 +431,23 @@ |
53 |
+ [[#include <linux/if_packet.h>]]) |
54 |
+ |
55 |
+ # If we use DPDK we might be able to use libnuma |
56 |
+-AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0) |
57 |
++AC_ARG_WITH(numa, |
58 |
++ AS_HELP_STRING(--with-numa,include NUMA support), |
59 |
++[ |
60 |
++ if test "$withval" = no |
61 |
++ then |
62 |
++ want_numa=no |
63 |
++ else |
64 |
++ want_numa=yes |
65 |
++ fi |
66 |
++],[ |
67 |
++ # Default to building without NUMA |
68 |
++ want_numa=yes |
69 |
++]) |
70 |
++ |
71 |
++if test "$want_numa" != no; then |
72 |
++ AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0) |
73 |
++fi |
74 |
+ |
75 |
+ # Checks for various "optional" libraries |
76 |
+ AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0) |
77 |
|
78 |
diff --git a/net-libs/libtrace/libtrace-4.0.0_beta.ebuild b/net-libs/libtrace/libtrace-4.0.0_beta.ebuild |
79 |
new file mode 100644 |
80 |
index 00000000..514c426 |
81 |
--- /dev/null |
82 |
+++ b/net-libs/libtrace/libtrace-4.0.0_beta.ebuild |
83 |
@@ -0,0 +1,58 @@ |
84 |
+# Copyright 1999-2016 Gentoo Foundation |
85 |
+# Distributed under the terms of the GNU General Public License v2 |
86 |
+# $Id$ |
87 |
+ |
88 |
+EAPI=6 |
89 |
+inherit autotools eutils |
90 |
+ |
91 |
+DESCRIPTION="A library and tools for trace processing" |
92 |
+HOMEPAGE="http://research.wand.net.nz/software/libtrace.php" |
93 |
+SRC_URI="http://research.wand.net.nz/software/${PN}/${P/_/-}.tar.gz" |
94 |
+ |
95 |
+LICENSE="GPL-2" |
96 |
+SLOT="0" |
97 |
+KEYWORDS="~amd64 ~x86" |
98 |
+IUSE="doc ncurses numa static-libs" |
99 |
+ |
100 |
+RDEPEND=" |
101 |
+ >=net-libs/libpcap-0.8 |
102 |
+ dev-libs/openssl:0= |
103 |
+ ncurses? ( sys-libs/ncurses:0= ) |
104 |
+ numa? ( sys-process/numactl ) |
105 |
+" |
106 |
+DEPEND=" |
107 |
+ ${RDEPEND} |
108 |
+ app-doc/doxygen |
109 |
+ sys-devel/flex |
110 |
+ virtual/pkgconfig |
111 |
+ virtual/yacc |
112 |
+" |
113 |
+PATCHES=( |
114 |
+ "${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch |
115 |
+ "${FILESDIR}"/${PN}-3.0.20-tinfo.patch |
116 |
+ "${FILESDIR}"/${PN}-4.0.0-no-examples.patch |
117 |
+ "${FILESDIR}"/${PN}-4.0.0-with-numa.patch |
118 |
+) |
119 |
+S=${WORKDIR}/${P/_beta/} |
120 |
+ |
121 |
+src_prepare() { |
122 |
+ default |
123 |
+ |
124 |
+ eautoreconf |
125 |
+} |
126 |
+ |
127 |
+src_configure() { |
128 |
+ econf \ |
129 |
+ $(use_enable static-libs static) \ |
130 |
+ $(use_with ncurses) \ |
131 |
+ $(use_with numa) \ |
132 |
+ --with-man |
133 |
+} |
134 |
+ |
135 |
+src_install() { |
136 |
+ default |
137 |
+ |
138 |
+ use doc && dodoc -r docs/doxygen/html |
139 |
+ |
140 |
+ prune_libtool_files --modules |
141 |
+} |
142 |
|
143 |
diff --git a/net-libs/libtrace/metadata.xml b/net-libs/libtrace/metadata.xml |
144 |
index 74c2bae..77a8e80 100644 |
145 |
--- a/net-libs/libtrace/metadata.xml |
146 |
+++ b/net-libs/libtrace/metadata.xml |
147 |
@@ -5,4 +5,7 @@ |
148 |
<email>netmon@g.o</email> |
149 |
<name>Gentoo network monitoring and analysis project</name> |
150 |
</maintainer> |
151 |
+<use> |
152 |
+<flag name='numa'>Use <pkg>sys-process/numactl</pkg></flag> |
153 |
+</use> |
154 |
</pkgmetadata> |