Package: flow-tools
Severity: minor
Tags: patch
User: pkg-llvm-t...@lists.alioth.debian.org
Usertags: clang-ftbfs
Hello,
Using the rebuild infrastructure, your package fails to build with clang
(instead of gcc).
Detected this kind of error:
http://clang.debian.net/status.php?version=3.5.0rc1&key=UNDEF_REF
Full build log is available here:
http://clang.debian.net/logs/2014-08-05/flow-tools_0.68-12.1_unstable_clang.log
Thanks,
Arthur
-- System Information:
Debian Release: jessie/sid (unstable)
Architecture: amd64 (x86_64)
Kernel: Linux 3.14-2-amd64
Locale: LANG=en_US.UTF-8, LC_CTYPE="en_US.UTF-8"
Shell: /bin/sh linked to /bin/dash
Compiler: Debian clang version 3.5.0-+rc1-2 (tags/RELEASE_35/rc1) (based on
LLVM 3.5.0)
diff -Naur flow-tools.orig/flow-tools-0.68/debian/changelog flow-tools/flow-tools-0.68/debian/changelog
--- flow-tools.orig/flow-tools-0.68/debian/changelog 2014-08-07 15:50:53.000545975 -0500
+++ flow-tools/flow-tools-0.68/debian/changelog 2014-08-07 15:53:26.760548652 -0500
@@ -1,3 +1,11 @@
+flow-tools (1:0.68-12.2) unstable; urgency=low
+
+ * Fix FTBFS with clang
+ - Fixed undefined reference error in
+ lib/ftfil.c
+
+ -- Arthur Marble <art...@info9.net> Thu, 07 Aug 2014 15:53:26 -0500
+
flow-tools (1:0.68-12.1) unstable; urgency=low
* Non-maintainer upload.
diff -Naur flow-tools.orig/flow-tools-0.68/patches/clang-ftbfs.diff flow-tools/flow-tools-0.68/patches/clang-ftbfs.diff
--- flow-tools.orig/flow-tools-0.68/patches/clang-ftbfs.diff 1969-12-31 18:00:00.000000000 -0600
+++ flow-tools/flow-tools-0.68/patches/clang-ftbfs.diff 2014-08-07 15:52:08.872547296 -0500
@@ -0,0 +1,558 @@
+--- a/lib/ftfil.c
++++ b/lib/ftfil.c
+@@ -359,105 +359,105 @@ static int parse_primitive_type_double(s
+ static int parse_primitive_type_rate(struct line_parser *lp,
+ struct ftfil *ftfil);
+
+-inline int eval_match_src_as(struct ftfil_lookup_as *lookup, char *rec,
++static inline int eval_match_src_as(struct ftfil_lookup_as *lookup, char *rec,
+ struct fts3rec_offsets *fo);
+-inline int eval_match_dst_as(struct ftfil_lookup_as *lookup, char *rec,
++static inline int eval_match_dst_as(struct ftfil_lookup_as *lookup, char *rec,
+ struct fts3rec_offsets *fo);
+-inline int eval_match_engine_type(struct ftfil_lookup_engine *lookup,
++static inline int eval_match_engine_type(struct ftfil_lookup_engine *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_engine_id(struct ftfil_lookup_engine *lookup,
++static inline int eval_match_engine_id(struct ftfil_lookup_engine *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_dst_if_index(struct ftfil_lookup_if_index *lookup,
++static inline int eval_match_dst_if_index(struct ftfil_lookup_if_index *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_src_if_index(struct ftfil_lookup_if_index *lookup,
++static inline int eval_match_src_if_index(struct ftfil_lookup_if_index *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_dst_port(struct ftfil_lookup_ip_port *lookup,
++static inline int eval_match_ip_dst_port(struct ftfil_lookup_ip_port *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_src_port(struct ftfil_lookup_ip_port *lookup,
++static inline int eval_match_ip_src_port(struct ftfil_lookup_ip_port *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_tcp_flags(struct ftfil_lookup_ip_tcp_flags *lookup,
++static inline int eval_match_ip_tcp_flags(struct ftfil_lookup_ip_tcp_flags *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_marked_tos(struct ftfil_lookup_ip_tos *lookup,
++static inline int eval_match_ip_marked_tos(struct ftfil_lookup_ip_tos *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_tos(struct ftfil_lookup_ip_tos *lookup,
++static inline int eval_match_ip_tos(struct ftfil_lookup_ip_tos *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_dst_prefix_len(struct ftfil_lookup_ip_prefix_len
++static inline int eval_match_ip_dst_prefix_len(struct ftfil_lookup_ip_prefix_len
+ *lookup, char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_src_prefix_len(struct ftfil_lookup_ip_prefix_len
++static inline int eval_match_ip_src_prefix_len(struct ftfil_lookup_ip_prefix_len
+ *lookup, char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_prot(struct ftfil_lookup_ip_prot *lookup, char *rec,
++static inline int eval_match_ip_prot(struct ftfil_lookup_ip_prot *lookup, char *rec,
+ struct fts3rec_offsets *fo);
+-inline int eval_match_flows(struct ftfil_lookup_counter *lookup, char *rec,
++static inline int eval_match_flows(struct ftfil_lookup_counter *lookup, char *rec,
+ struct fts3rec_offsets *fo);
+-inline int eval_match_octets(struct ftfil_lookup_counter *lookup, char *rec,
++static inline int eval_match_octets(struct ftfil_lookup_counter *lookup, char *rec,
+ struct fts3rec_offsets *fo);
+-inline int eval_match_packets(struct ftfil_lookup_counter *lookup, char *rec,
++static inline int eval_match_packets(struct ftfil_lookup_counter *lookup, char *rec,
+ struct fts3rec_offsets *fo);
+-inline int eval_match_xtra_packets(struct ftfil_lookup_counter *lookup,
++static inline int eval_match_xtra_packets(struct ftfil_lookup_counter *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_duration(struct ftfil_lookup_counter *lookup, char *rec,
++static inline int eval_match_duration(struct ftfil_lookup_counter *lookup, char *rec,
+ struct fts3rec_offsets *fo);
+
+-inline int eval_match_start_time_date(struct ftfil_lookup_counter *lookup,
++static inline int eval_match_start_time_date(struct ftfil_lookup_counter *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_end_time_date(struct ftfil_lookup_counter *lookup,
++static inline int eval_match_end_time_date(struct ftfil_lookup_counter *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+
+-inline int eval_match_start_time(struct ftfil_lookup_time *lookup,
++static inline int eval_match_start_time(struct ftfil_lookup_time *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_end_time(struct ftfil_lookup_time *lookup,
++static inline int eval_match_end_time(struct ftfil_lookup_time *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+
+-inline int eval_match_src_tag_l(struct ftfil_lookup_tag_mask *lookup,
++static inline int eval_match_src_tag_l(struct ftfil_lookup_tag_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_src_tag_h(struct ftfil_lookup_tag *lookup,
++static inline int eval_match_src_tag_h(struct ftfil_lookup_tag *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_dst_tag_l(struct ftfil_lookup_tag_mask *lookup,
++static inline int eval_match_dst_tag_l(struct ftfil_lookup_tag_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_dst_tag_h(struct ftfil_lookup_tag *lookup,
++static inline int eval_match_dst_tag_h(struct ftfil_lookup_tag *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+
+-inline int eval_match_ip_sc_addr_l(struct ftfil_lookup_ip_mask *lookup,
++static inline int eval_match_ip_sc_addr_l(struct ftfil_lookup_ip_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_sc_addr_h(struct ftfil_lookup_ip_address *lookup,
++static inline int eval_match_ip_sc_addr_h(struct ftfil_lookup_ip_address *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_sc_addr_r(struct ftfil_lookup_ip_prefix *lookup,
++static inline int eval_match_ip_sc_addr_r(struct ftfil_lookup_ip_prefix *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+
+-inline int eval_match_ip_nexthop_addr_l(struct ftfil_lookup_ip_mask *lookup,
++static inline int eval_match_ip_nexthop_addr_l(struct ftfil_lookup_ip_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_nexthop_addr_h(struct ftfil_lookup_ip_address *lookup,
++static inline int eval_match_ip_nexthop_addr_h(struct ftfil_lookup_ip_address *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_nexthop_addr_r(struct ftfil_lookup_ip_prefix *lookup,
++static inline int eval_match_ip_nexthop_addr_r(struct ftfil_lookup_ip_prefix *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+
+-inline int eval_match_ip_src_addr_l(struct ftfil_lookup_ip_mask *lookup,
++static inline int eval_match_ip_src_addr_l(struct ftfil_lookup_ip_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_src_addr_h(struct ftfil_lookup_ip_address *lookup,
++static inline int eval_match_ip_src_addr_h(struct ftfil_lookup_ip_address *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_src_addr_r(struct ftfil_lookup_ip_prefix *lookup,
++static inline int eval_match_ip_src_addr_r(struct ftfil_lookup_ip_prefix *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+
+-inline int eval_match_ip_dst_addr_l(struct ftfil_lookup_ip_mask *lookup,
++static inline int eval_match_ip_dst_addr_l(struct ftfil_lookup_ip_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_dst_addr_h(struct ftfil_lookup_ip_address *lookup,
++static inline int eval_match_ip_dst_addr_h(struct ftfil_lookup_ip_address *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_dst_addr_r(struct ftfil_lookup_ip_prefix *lookup,
++static inline int eval_match_ip_dst_addr_r(struct ftfil_lookup_ip_prefix *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+
+-inline int eval_match_ip_exporter_addr_l(struct ftfil_lookup_ip_mask *lookup,
++static inline int eval_match_ip_exporter_addr_l(struct ftfil_lookup_ip_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_exporter_addr_h(struct ftfil_lookup_ip_address *lookup,
++static inline int eval_match_ip_exporter_addr_h(struct ftfil_lookup_ip_address *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_ip_exporter_addr_r(struct ftfil_lookup_ip_prefix *lookup,
++static inline int eval_match_ip_exporter_addr_r(struct ftfil_lookup_ip_prefix *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+
+-inline int eval_match_pps(struct ftfil_lookup_double *lookup,
++static inline int eval_match_pps(struct ftfil_lookup_double *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+-inline int eval_match_bps(struct ftfil_lookup_double *lookup,
++static inline int eval_match_bps(struct ftfil_lookup_double *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+
+-inline int eval_match_random_sample(struct ftfil_lookup_rate *lookup,
++static inline int eval_match_random_sample(struct ftfil_lookup_rate *lookup,
+ char *rec, struct fts3rec_offsets *fo);
+
+ static int resolve_primitives(struct ftfil *ftfil);
+@@ -547,7 +547,7 @@ static struct jump pjump[] = {
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_src_as(struct ftfil_lookup_as *lookup, char *rec,
++static inline int eval_match_src_as(struct ftfil_lookup_as *lookup, char *rec,
+ struct fts3rec_offsets *fo)
+ {
+ u_int16 *src_as;
+@@ -574,7 +574,7 @@ inline int eval_match_src_as(struct ftfi
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_dst_as(struct ftfil_lookup_as *lookup, char *rec,
++static inline int eval_match_dst_as(struct ftfil_lookup_as *lookup, char *rec,
+ struct fts3rec_offsets *fo)
+ {
+ u_int16 *dst_as;
+@@ -602,7 +602,7 @@ inline int eval_match_dst_as(struct ftfi
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_prot(struct ftfil_lookup_ip_prot *lookup, char *rec,
++static inline int eval_match_ip_prot(struct ftfil_lookup_ip_prot *lookup, char *rec,
+ struct fts3rec_offsets *fo)
+ {
+ u_int8 *ip_prot;
+@@ -630,7 +630,7 @@ inline int eval_match_ip_prot(struct ftf
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_src_prefix_len(struct ftfil_lookup_ip_prefix_len *lookup,
++static inline int eval_match_ip_src_prefix_len(struct ftfil_lookup_ip_prefix_len *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ u_int8 *src_mask;
+@@ -658,7 +658,7 @@ inline int eval_match_ip_src_prefix_len(
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_dst_prefix_len(struct ftfil_lookup_ip_prefix_len *lookup,
++static inline int eval_match_ip_dst_prefix_len(struct ftfil_lookup_ip_prefix_len *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ u_int8 *dst_mask;
+@@ -686,7 +686,7 @@ inline int eval_match_ip_dst_prefix_len(
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_tos(struct ftfil_lookup_ip_tos *lookup,
++static inline int eval_match_ip_tos(struct ftfil_lookup_ip_tos *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ u_int8 tos;
+@@ -714,7 +714,7 @@ inline int eval_match_ip_tos(struct ftfi
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_marked_tos(struct ftfil_lookup_ip_tos *lookup,
++static inline int eval_match_ip_marked_tos(struct ftfil_lookup_ip_tos *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ u_int8 marked_tos;
+@@ -743,7 +743,7 @@ inline int eval_match_ip_marked_tos(stru
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_tcp_flags(struct ftfil_lookup_ip_tcp_flags *lookup,
++static inline int eval_match_ip_tcp_flags(struct ftfil_lookup_ip_tcp_flags *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ u_int8 tcp_flags;
+@@ -772,7 +772,7 @@ inline int eval_match_ip_tcp_flags(struc
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_src_port(struct ftfil_lookup_ip_port *lookup,
++static inline int eval_match_ip_src_port(struct ftfil_lookup_ip_port *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ u_int16 *src_port;
+@@ -799,7 +799,7 @@ inline int eval_match_ip_src_port(struct
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_dst_port(struct ftfil_lookup_ip_port *lookup,
++static inline int eval_match_ip_dst_port(struct ftfil_lookup_ip_port *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ u_int16 *dst_port;
+@@ -827,7 +827,7 @@ inline int eval_match_ip_dst_port(struct
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_src_if_index(struct ftfil_lookup_if_index *lookup,
++static inline int eval_match_src_if_index(struct ftfil_lookup_if_index *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ u_int16 *src_if_index;
+@@ -854,7 +854,7 @@ inline int eval_match_src_if_index(struc
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_dst_if_index(struct ftfil_lookup_if_index *lookup,
++static inline int eval_match_dst_if_index(struct ftfil_lookup_if_index *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ u_int16 *dst_if_index;
+@@ -882,7 +882,7 @@ inline int eval_match_dst_if_index(struc
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_engine_id(struct ftfil_lookup_engine *lookup,
++static inline int eval_match_engine_id(struct ftfil_lookup_engine *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ u_int8 *engine_id;
+@@ -910,7 +910,7 @@ inline int eval_match_engine_id(struct f
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_engine_type(struct ftfil_lookup_engine *lookup,
++static inline int eval_match_engine_type(struct ftfil_lookup_engine *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ u_int8 *engine_type;
+@@ -937,7 +937,7 @@ inline int eval_match_engine_type(struct
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_flows(struct ftfil_lookup_counter *lookup, char *rec,
++static inline int eval_match_flows(struct ftfil_lookup_counter *lookup, char *rec,
+ struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_counter_rec *ftflcr;
+@@ -1002,7 +1002,7 @@ inline int eval_match_flows(struct ftfil
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_octets(struct ftfil_lookup_counter *lookup, char *rec,
++static inline int eval_match_octets(struct ftfil_lookup_counter *lookup, char *rec,
+ struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_counter_rec *ftflcr;
+@@ -1067,7 +1067,7 @@ inline int eval_match_octets(struct ftfi
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_packets(struct ftfil_lookup_counter *lookup, char *rec,
++static inline int eval_match_packets(struct ftfil_lookup_counter *lookup, char *rec,
+ struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_counter_rec *ftflcr;
+@@ -1132,7 +1132,7 @@ inline int eval_match_packets(struct ftf
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_xtra_packets(struct ftfil_lookup_counter *lookup,
++static inline int eval_match_xtra_packets(struct ftfil_lookup_counter *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_counter_rec *ftflcr;
+@@ -1197,7 +1197,7 @@ inline int eval_match_xtra_packets(struc
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_duration(struct ftfil_lookup_counter *lookup, char *rec,
++static inline int eval_match_duration(struct ftfil_lookup_counter *lookup, char *rec,
+ struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_counter_rec *ftflcr;
+@@ -1264,7 +1264,7 @@ inline int eval_match_duration(struct ft
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_start_time_date(struct ftfil_lookup_counter *lookup,
++static inline int eval_match_start_time_date(struct ftfil_lookup_counter *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_counter_rec *ftflcr;
+@@ -1335,7 +1335,7 @@ inline int eval_match_start_time_date(st
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_end_time_date(struct ftfil_lookup_counter *lookup,
++static inline int eval_match_end_time_date(struct ftfil_lookup_counter *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_counter_rec *ftflcr;
+@@ -1406,7 +1406,7 @@ inline int eval_match_end_time_date(stru
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_start_time(struct ftfil_lookup_time *lookup,
++static inline int eval_match_start_time(struct ftfil_lookup_time *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ time_t t1, t2;
+@@ -1496,7 +1496,7 @@ inline int eval_match_start_time(struct
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_end_time(struct ftfil_lookup_time *lookup,
++static inline int eval_match_end_time(struct ftfil_lookup_time *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ time_t t1, t2;
+@@ -1586,7 +1586,7 @@ inline int eval_match_end_time(struct ft
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_src_tag_l(struct ftfil_lookup_tag_mask *lookup,
++static inline int eval_match_src_tag_l(struct ftfil_lookup_tag_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_tag_mask_rec *ftfltmr;
+@@ -1624,7 +1624,7 @@ inline int eval_match_src_tag_l(struct f
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_src_tag_h(struct ftfil_lookup_tag *lookup,
++static inline int eval_match_src_tag_h(struct ftfil_lookup_tag *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftchash_rec_fil_c32 *ftch_recfc32p;
+@@ -1658,7 +1658,7 @@ inline int eval_match_src_tag_h(struct f
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_dst_tag_h(struct ftfil_lookup_tag *lookup,
++static inline int eval_match_dst_tag_h(struct ftfil_lookup_tag *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftchash_rec_fil_c32 *ftch_recfc32p;
+@@ -1692,7 +1692,7 @@ inline int eval_match_dst_tag_h(struct f
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_dst_tag_l(struct ftfil_lookup_tag_mask *lookup,
++static inline int eval_match_dst_tag_l(struct ftfil_lookup_tag_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_tag_mask_rec *ftfltmr;
+@@ -1730,7 +1730,7 @@ inline int eval_match_dst_tag_l(struct f
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_nexthop_addr_l(struct ftfil_lookup_ip_mask *lookup,
++static inline int eval_match_ip_nexthop_addr_l(struct ftfil_lookup_ip_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_ip_mask_rec *ftflipmr;
+@@ -1768,7 +1768,7 @@ inline int eval_match_ip_nexthop_addr_l(
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_nexthop_addr_h(struct ftfil_lookup_ip_address *lookup,
++static inline int eval_match_ip_nexthop_addr_h(struct ftfil_lookup_ip_address *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftchash_rec_fil_c32 *ftch_recfc32p;
+@@ -1802,7 +1802,7 @@ inline int eval_match_ip_nexthop_addr_h(
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_nexthop_addr_r(struct ftfil_lookup_ip_prefix *lookup,
++static inline int eval_match_ip_nexthop_addr_r(struct ftfil_lookup_ip_prefix *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_ip_prefix_rec *ftflipprr;
+@@ -1839,7 +1839,7 @@ inline int eval_match_ip_nexthop_addr_r(
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_sc_addr_l(struct ftfil_lookup_ip_mask *lookup,
++static inline int eval_match_ip_sc_addr_l(struct ftfil_lookup_ip_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_ip_mask_rec *ftflipmr;
+@@ -1877,7 +1877,7 @@ inline int eval_match_ip_sc_addr_l(struc
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_sc_addr_h(struct ftfil_lookup_ip_address *lookup,
++static inline int eval_match_ip_sc_addr_h(struct ftfil_lookup_ip_address *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftchash_rec_fil_c32 *ftch_recfc32p;
+@@ -1911,7 +1911,7 @@ inline int eval_match_ip_sc_addr_h(struc
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_sc_addr_r(struct ftfil_lookup_ip_prefix *lookup,
++static inline int eval_match_ip_sc_addr_r(struct ftfil_lookup_ip_prefix *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_ip_prefix_rec *ftflipprr;
+@@ -1948,7 +1948,7 @@ inline int eval_match_ip_sc_addr_r(struc
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_src_addr_l(struct ftfil_lookup_ip_mask *lookup,
++static inline int eval_match_ip_src_addr_l(struct ftfil_lookup_ip_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_ip_mask_rec *ftflipmr;
+@@ -1986,7 +1986,7 @@ inline int eval_match_ip_src_addr_l(stru
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_src_addr_h(struct ftfil_lookup_ip_address *lookup,
++static inline int eval_match_ip_src_addr_h(struct ftfil_lookup_ip_address *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftchash_rec_fil_c32 *ftch_recfc32p;
+@@ -2020,7 +2020,7 @@ inline int eval_match_ip_src_addr_h(stru
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_src_addr_r(struct ftfil_lookup_ip_prefix *lookup,
++static inline int eval_match_ip_src_addr_r(struct ftfil_lookup_ip_prefix *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_ip_prefix_rec *ftflipprr;
+@@ -2057,7 +2057,7 @@ inline int eval_match_ip_src_addr_r(stru
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_dst_addr_l(struct ftfil_lookup_ip_mask *lookup,
++static inline int eval_match_ip_dst_addr_l(struct ftfil_lookup_ip_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_ip_mask_rec *ftflipmr;
+@@ -2095,7 +2095,7 @@ inline int eval_match_ip_dst_addr_l(stru
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_dst_addr_h(struct ftfil_lookup_ip_address *lookup,
++static inline int eval_match_ip_dst_addr_h(struct ftfil_lookup_ip_address *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftchash_rec_fil_c32 *ftch_recfc32p;
+@@ -2129,7 +2129,7 @@ inline int eval_match_ip_dst_addr_h(stru
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_dst_addr_r(struct ftfil_lookup_ip_prefix *lookup,
++static inline int eval_match_ip_dst_addr_r(struct ftfil_lookup_ip_prefix *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_ip_prefix_rec *ftflipprr;
+@@ -2166,7 +2166,7 @@ inline int eval_match_ip_dst_addr_r(stru
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_exporter_addr_l(struct ftfil_lookup_ip_mask *lookup,
++static inline int eval_match_ip_exporter_addr_l(struct ftfil_lookup_ip_mask *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_ip_mask_rec *ftflipmr;
+@@ -2204,7 +2204,7 @@ inline int eval_match_ip_exporter_addr_l
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_exporter_addr_h(struct ftfil_lookup_ip_address *lookup,
++static inline int eval_match_ip_exporter_addr_h(struct ftfil_lookup_ip_address *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftchash_rec_fil_c32 *ftch_recfc32p;
+@@ -2238,7 +2238,7 @@ inline int eval_match_ip_exporter_addr_h
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_ip_exporter_addr_r(struct ftfil_lookup_ip_prefix *lookup,
++static inline int eval_match_ip_exporter_addr_r(struct ftfil_lookup_ip_prefix *lookup,
+ char *rec, struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_ip_prefix_rec *ftflipprr;
+@@ -2275,7 +2275,7 @@ inline int eval_match_ip_exporter_addr_r
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_bps(struct ftfil_lookup_double *lookup, char *rec,
++static inline int eval_match_bps(struct ftfil_lookup_double *lookup, char *rec,
+ struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_double_rec *ftfldr;
+@@ -2349,7 +2349,7 @@ inline int eval_match_bps(struct ftfil_l
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_pps(struct ftfil_lookup_double *lookup, char *rec,
++static inline int eval_match_pps(struct ftfil_lookup_double *lookup, char *rec,
+ struct fts3rec_offsets *fo)
+ {
+ struct ftfil_lookup_double_rec *ftfldr;
+@@ -2423,7 +2423,7 @@ inline int eval_match_pps(struct ftfil_l
+ * returns: FT_FIL_MODE_PERMIT
+ * FT_FIL_MODE_DENY
+ */
+-inline int eval_match_random_sample(struct ftfil_lookup_rate *lookup, char *rec,
++static inline int eval_match_random_sample(struct ftfil_lookup_rate *lookup, char *rec,
+ struct fts3rec_offsets *fo)
+ {
+ int val;
diff -Naur flow-tools.orig/flow-tools-0.68/patches/series flow-tools/flow-tools-0.68/patches/series
--- flow-tools.orig/flow-tools-0.68/patches/series 1969-12-31 18:00:00.000000000 -0600
+++ flow-tools/flow-tools-0.68/patches/series 2014-08-07 15:51:31.192546640 -0500
@@ -0,0 +1 @@
+clang-ftbfs.diff
