1 |
commit: 4b8a9dc1aee5aee1e94a70c3ca35d45d3fd9a039 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 18 15:02:58 2018 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 18 15:03:15 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b8a9dc1 |
7 |
|
8 |
net-libs/daq: Fix USE=static-libs |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
12 |
|
13 |
.../daq/{daq-2.0.6.ebuild => daq-2.0.6-r1.ebuild} | 10 +- |
14 |
net-libs/daq/files/daq-2.0.6-static-libs.patch | 151 +++++++++++++++++++++ |
15 |
2 files changed, 157 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/net-libs/daq/daq-2.0.6.ebuild b/net-libs/daq/daq-2.0.6-r1.ebuild |
18 |
similarity index 95% |
19 |
rename from net-libs/daq/daq-2.0.6.ebuild |
20 |
rename to net-libs/daq/daq-2.0.6-r1.ebuild |
21 |
index 5b5742cc309..ff91d75a4a1 100644 |
22 |
--- a/net-libs/daq/daq-2.0.6.ebuild |
23 |
+++ b/net-libs/daq/daq-2.0.6-r1.ebuild |
24 |
@@ -29,6 +29,7 @@ DEPEND=" |
25 |
RDEPEND="${DEPEND}" |
26 |
PATCHES=( |
27 |
"${FILESDIR}"/${PN}-2.0.6-parallel-grammar.patch #673390 |
28 |
+ "${FILESDIR}"/${PN}-2.0.6-static-libs.patch |
29 |
) |
30 |
|
31 |
src_prepare() { |
32 |
@@ -42,15 +43,16 @@ src_configure() { |
33 |
# cross-compiling doesn't break on us. |
34 |
daq_cv_libpcap_version_1x=yes \ |
35 |
econf \ |
36 |
- $(use_enable ipv6) \ |
37 |
- $(use_enable pcap pcap-module) \ |
38 |
$(use_enable afpacket afpacket-module) \ |
39 |
$(use_enable dump dump-module) \ |
40 |
- $(use_enable nfq nfq-module) \ |
41 |
$(use_enable ipq ipq-module) \ |
42 |
+ $(use_enable ipv6) \ |
43 |
+ $(use_enable nfq nfq-module) \ |
44 |
+ $(use_enable pcap pcap-module) \ |
45 |
$(use_enable static-libs static) \ |
46 |
+ --disable-bundled-modules \ |
47 |
--disable-ipfw-module \ |
48 |
- --disable-bundled-modules |
49 |
+ --enable-shared |
50 |
} |
51 |
|
52 |
DOCS=( ChangeLog README ) |
53 |
|
54 |
diff --git a/net-libs/daq/files/daq-2.0.6-static-libs.patch b/net-libs/daq/files/daq-2.0.6-static-libs.patch |
55 |
new file mode 100644 |
56 |
index 00000000000..fb91c2c39e4 |
57 |
--- /dev/null |
58 |
+++ b/net-libs/daq/files/daq-2.0.6-static-libs.patch |
59 |
@@ -0,0 +1,151 @@ |
60 |
+--- a/configure.ac |
61 |
++++ b/configure.ac |
62 |
+@@ -268,7 +268,8 @@ |
63 |
+ |
64 |
+ AC_CHECK_LIB([dl], [dlopen], [LIBDL="-ldl"]) |
65 |
+ |
66 |
+-AM_CONDITIONAL([BUILD_SHARED_MODULES], [ test "$enable_shared" = yes ]) |
67 |
++AM_CONDITIONAL([BUILD_STATIC_LIBRARIES], [ test "$enable_shared" = no ]) |
68 |
++AM_CONDITIONAL([BUILD_STATIC_MODULES], [ test "$enable_shared" = no ]) |
69 |
+ |
70 |
+ # Checks for header files. |
71 |
+ AC_CHECK_HEADERS([inttypes.h memory.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h]) |
72 |
+--- a/api/Makefile.am |
73 |
++++ b/api/Makefile.am |
74 |
+@@ -4,12 +4,15 @@ |
75 |
+ |
76 |
+ include_HEADERS = daq.h daq_api.h daq_common.h |
77 |
+ |
78 |
+-lib_LTLIBRARIES = libdaq.la libdaq_static.la |
79 |
++lib_LTLIBRARIES = libdaq.la |
80 |
++ |
81 |
++if BUILD_STATIC_LIBRARIES |
82 |
++ lib_LTLIBRARIES += libdaq_static.la |
83 |
++ libdaq_static_la_SOURCES = daq_base.c daq_mod_ops.c daq.h daq_api.h daq_common.h |
84 |
++ libdaq_static_la_CFLAGS = -DSTATIC_MODULE_LIST |
85 |
++ libdaq_static_la_LDFLAGS = -static |
86 |
++endif |
87 |
+ |
88 |
+ libdaq_la_SOURCES = daq_base.c daq_mod_ops.c daq.h daq_api.h daq_common.h |
89 |
+ libdaq_la_LDFLAGS = -version-info 2:4:0 @XCCFLAGS@ |
90 |
+ libdaq_la_LIBADD = @LIBDL@ |
91 |
+- |
92 |
+-libdaq_static_la_SOURCES = daq_base.c daq_mod_ops.c daq.h daq_api.h daq_common.h |
93 |
+-libdaq_static_la_CFLAGS = -DSTATIC_MODULE_LIST |
94 |
+-libdaq_static_la_LDFLAGS = -static |
95 |
+--- a/os-daq-modules/Makefile.am |
96 |
++++ b/os-daq-modules/Makefile.am |
97 |
+@@ -6,7 +6,9 @@ |
98 |
+ |
99 |
+ pkglib_LTLIBRARIES = |
100 |
+ |
101 |
+-lib_LTLIBRARIES = libdaq_static_modules.la |
102 |
++if BUILD_STATIC_MODULES |
103 |
++ pkglib_LTLIBRARIES += libdaq_static_modules.la |
104 |
++endif |
105 |
+ libdaq_static_modules_la_SOURCES = \ |
106 |
+ daq_static_modules.c \ |
107 |
+ daq_static_modules.h |
108 |
+@@ -15,88 +17,88 @@ |
109 |
+ libdaq_static_modules_la_LIBADD = |
110 |
+ |
111 |
+ if BUILD_AFPACKET_MODULE |
112 |
+-if BUILD_SHARED_MODULES |
113 |
+ pkglib_LTLIBRARIES += daq_afpacket.la |
114 |
+ daq_afpacket_la_SOURCES = daq_afpacket.c |
115 |
+ daq_afpacket_la_CFLAGS = -DBUILDING_SO |
116 |
+ daq_afpacket_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@ |
117 |
+ daq_afpacket_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la |
118 |
+-endif |
119 |
++if BUILD_STATIC_MODULES |
120 |
+ libdaq_static_modules_la_SOURCES += daq_afpacket.c |
121 |
+ libdaq_static_modules_la_CFLAGS += -DBUILD_AFPACKET_MODULE |
122 |
+ endif |
123 |
++endif |
124 |
+ |
125 |
+ if BUILD_PCAP_MODULE |
126 |
+-if BUILD_SHARED_MODULES |
127 |
+ pkglib_LTLIBRARIES += daq_pcap.la |
128 |
+ daq_pcap_la_SOURCES = daq_pcap.c |
129 |
+ daq_pcap_la_CFLAGS = -DBUILDING_SO |
130 |
+ daq_pcap_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@ |
131 |
+ daq_pcap_la_LIBADD = -lpcap |
132 |
+-endif |
133 |
++if BUILD_STATIC_MODULES |
134 |
+ libdaq_static_modules_la_SOURCES += daq_pcap.c |
135 |
+ libdaq_static_modules_la_CFLAGS += -DBUILD_PCAP_MODULE |
136 |
+ endif |
137 |
++endif |
138 |
+ |
139 |
+ if BUILD_DUMP_MODULE |
140 |
+-if BUILD_SHARED_MODULES |
141 |
+ pkglib_LTLIBRARIES += daq_dump.la |
142 |
+ daq_dump_la_SOURCES = daq_dump.c |
143 |
+ daq_dump_la_CFLAGS = -DBUILDING_SO |
144 |
+ daq_dump_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@ |
145 |
+ daq_dump_la_LIBADD = -lpcap |
146 |
+-endif |
147 |
++if BUILD_STATIC_MODULES |
148 |
+ libdaq_static_modules_la_SOURCES += daq_dump.c |
149 |
+ libdaq_static_modules_la_CFLAGS += -DBUILD_DUMP_MODULE |
150 |
+ endif |
151 |
++endif |
152 |
+ |
153 |
+ if BUILD_IPFW_MODULE |
154 |
+-if BUILD_SHARED_MODULES |
155 |
+ pkglib_LTLIBRARIES += daq_ipfw.la |
156 |
+ daq_ipfw_la_SOURCES = daq_ipfw.c |
157 |
+ daq_ipfw_la_CFLAGS = -DBUILDING_SO |
158 |
+ daq_ipfw_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@ |
159 |
+ daq_ipfw_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la |
160 |
+-endif |
161 |
++if BUILD_STATIC_MODULES |
162 |
+ libdaq_static_modules_la_SOURCES += daq_ipfw.c |
163 |
+ libdaq_static_modules_la_CFLAGS += -DBUILD_IPFW_MODULE |
164 |
+ endif |
165 |
++endif |
166 |
+ |
167 |
+ if BUILD_IPQ_MODULE |
168 |
+-if BUILD_SHARED_MODULES |
169 |
+ pkglib_LTLIBRARIES += daq_ipq.la |
170 |
+ daq_ipq_la_SOURCES = daq_ipq.c |
171 |
+ daq_ipq_la_CFLAGS = -DBUILDING_SO |
172 |
+ daq_ipq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @DNET_LDFLAGS@ @XCCFLAGS@ |
173 |
+ daq_ipq_la_LIBADD = -lipq @DNET_LDFLAGS@ $(top_builddir)/sfbpf/libsfbpf.la |
174 |
+-endif |
175 |
++if BUILD_STATIC_MODULES |
176 |
+ libdaq_static_modules_la_SOURCES += daq_ipq.c |
177 |
+ libdaq_static_modules_la_CFLAGS += -DBUILD_IPQ_MODULE |
178 |
+ endif |
179 |
++endif |
180 |
+ |
181 |
+ if BUILD_NFQ_MODULE |
182 |
+-if BUILD_SHARED_MODULES |
183 |
+ pkglib_LTLIBRARIES += daq_nfq.la |
184 |
+ daq_nfq_la_SOURCES = daq_nfq.c |
185 |
+ daq_nfq_la_CFLAGS = -DBUILDING_SO |
186 |
+ daq_nfq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @DNET_LDFLAGS@ @XCCFLAGS@ |
187 |
+ daq_nfq_la_LIBADD = -lnfnetlink -lnetfilter_queue @DNET_LDFLAGS@ $(top_builddir)/sfbpf/libsfbpf.la |
188 |
+-endif |
189 |
++if BUILD_STATIC_MODULES |
190 |
+ libdaq_static_modules_la_SOURCES += daq_nfq.c |
191 |
+ libdaq_static_modules_la_CFLAGS += -DBUILD_NFQ_MODULE |
192 |
+ endif |
193 |
++endif |
194 |
+ |
195 |
+ if BUILD_NETMAP_MODULE |
196 |
+-if BUILD_SHARED_MODULES |
197 |
+ pkglib_LTLIBRARIES += daq_netmap.la |
198 |
+ daq_netmap_la_SOURCES = daq_netmap.c |
199 |
+ daq_netmap_la_CFLAGS = -DBUILDING_SO |
200 |
+ daq_netmap_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@ |
201 |
+ daq_netmap_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la |
202 |
+-endif |
203 |
++if BUILD_STATIC_MODULES |
204 |
+ libdaq_static_modules_la_SOURCES += daq_netmap.c |
205 |
+ libdaq_static_modules_la_CFLAGS += -DBUILD_NETMAP_MODULE |
206 |
+ endif |
207 |
++endif |
208 |
+ |
209 |
+ AM_CPPFLAGS = -I$(top_srcdir)/api -I$(top_srcdir)/sfbpf -I$(top_builddir)/sfbpf |
210 |
+ |