Fuzz: fix compilation with nBPF (#1860)

Close #1859

1 files changed, 24 insertions, 24 deletions

diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am
index c80818324..24fa98983 100644
--- a/fuzz/Makefile.am
+++ b/fuzz/Makefile.am
@@ -6,8 +6,8 @@ bin_PROGRAMS += fuzz_ds_patricia fuzz_ds_ahocorasick
 
 fuzz_process_packet_SOURCES = fuzz_process_packet.c fuzz_common_code.c
 fuzz_process_packet_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
-fuzz_process_packet_LDADD = ../src/lib/libndpi.a
-fuzz_process_packet_LDFLAGS = $(ADDITIONAL_LIBS) $(LIBS)
+fuzz_process_packet_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_process_packet_LDFLAGS = $(LIBS)
 if HAS_FUZZLDFLAGS
 fuzz_process_packet_CFLAGS += $(LIB_FUZZING_ENGINE)
 fuzz_process_packet_LDFLAGS += $(LIB_FUZZING_ENGINE)
@@ -19,8 +19,8 @@ fuzz_process_packet_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 
 fuzz_ndpi_reader_SOURCES = fuzz_ndpi_reader.c ../example/reader_util.c
 fuzz_ndpi_reader_CFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS)
-fuzz_ndpi_reader_LDADD = ../src/lib/libndpi.a
-fuzz_ndpi_reader_LDFLAGS = $(PCAP_LIB) $(ADDITIONAL_LIBS) $(LIBS)
+fuzz_ndpi_reader_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_ndpi_reader_LDFLAGS = $(PCAP_LIB) $(LIBS)
 if HAS_FUZZLDFLAGS
 fuzz_ndpi_reader_CFLAGS += $(LIB_FUZZING_ENGINE)
 fuzz_ndpi_reader_LDFLAGS += $(LIB_FUZZING_ENGINE)
@@ -32,8 +32,8 @@ fuzz_ndpi_reader_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 
 fuzz_ndpi_reader_alloc_fail_SOURCES = fuzz_ndpi_reader.c fuzz_common_code.c ../example/reader_util.c
 fuzz_ndpi_reader_alloc_fail_CFLAGS = -I../example/ @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
-fuzz_ndpi_reader_alloc_fail_LDADD = ../src/lib/libndpi.a
-fuzz_ndpi_reader_alloc_fail_LDFLAGS = $(PCAP_LIB) $(ADDITIONAL_LIBS) $(LIBS)
+fuzz_ndpi_reader_alloc_fail_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_ndpi_reader_alloc_fail_LDFLAGS = $(PCAP_LIB) $(LIBS)
 if HAS_FUZZLDFLAGS
 fuzz_ndpi_reader_alloc_fail_CFLAGS += $(LIB_FUZZING_ENGINE)
 fuzz_ndpi_reader_alloc_fail_LDFLAGS += $(LIB_FUZZING_ENGINE)
@@ -45,8 +45,8 @@ fuzz_ndpi_reader_alloc_fail_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
 
 fuzz_quic_get_crypto_data_SOURCES = fuzz_quic_get_crypto_data.c fuzz_common_code.c
 fuzz_quic_get_crypto_data_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
-fuzz_quic_get_crypto_data_LDADD = ../src/lib/libndpi.a
-fuzz_quic_get_crypto_data_LDFLAGS = $(ADDITIONAL_LIBS) $(LIBS)
+fuzz_quic_get_crypto_data_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_quic_get_crypto_data_LDFLAGS = $(LIBS)
 if HAS_FUZZLDFLAGS
 fuzz_quic_get_crypto_data_CFLAGS += $(LIB_FUZZING_ENGINE)
 fuzz_quic_get_crypto_data_LDFLAGS += $(LIB_FUZZING_ENGINE)
@@ -59,8 +59,8 @@ fuzz_quic_get_crypto_data_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS)
 fuzz_config_SOURCES = fuzz_config.cpp fuzz_common_code.c
 fuzz_config_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
 fuzz_config_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
-fuzz_config_LDADD = ../src/lib/libndpi.a
-fuzz_config_LDFLAGS = $(ADDITIONAL_LIBS) $(LIBS)
+fuzz_config_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_config_LDFLAGS = $(LIBS)
 if HAS_FUZZLDFLAGS
 fuzz_config_CXXFLAGS += $(LIB_FUZZING_ENGINE)
 fuzz_config_CFLAGS += $(LIB_FUZZING_ENGINE)
@@ -74,8 +74,8 @@ fuzz_config_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 fuzz_alg_bins_SOURCES = fuzz_alg_bins.cpp fuzz_common_code.c
 fuzz_alg_bins_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
 fuzz_alg_bins_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
-fuzz_alg_bins_LDADD = ../src/lib/libndpi.a
-fuzz_alg_bins_LDFLAGS = $(ADDITIONAL_LIBS) $(LIBS)
+fuzz_alg_bins_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_alg_bins_LDFLAGS = $(LIBS)
 if HAS_FUZZLDFLAGS
 fuzz_alg_bins_CXXFLAGS += $(LIB_FUZZING_ENGINE)
 fuzz_alg_bins_CFLAGS += $(LIB_FUZZING_ENGINE)
@@ -89,8 +89,8 @@ fuzz_alg_bins_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 fuzz_alg_hll_SOURCES = fuzz_alg_hll.cpp fuzz_common_code.c
 fuzz_alg_hll_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
 fuzz_alg_hll_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
-fuzz_alg_hll_LDADD = ../src/lib/libndpi.a
-fuzz_alg_hll_LDFLAGS = $(ADDITIONAL_LIBS) $(LIBS)
+fuzz_alg_hll_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_alg_hll_LDFLAGS = $(LIBS)
 if HAS_FUZZLDFLAGS
 fuzz_alg_hll_CXXFLAGS += $(LIB_FUZZING_ENGINE)
 fuzz_alg_hll_CFLAGS += $(LIB_FUZZING_ENGINE)
@@ -104,8 +104,8 @@ fuzz_alg_hll_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 fuzz_alg_hw_rsi_outliers_da_SOURCES = fuzz_alg_hw_rsi_outliers_da.cpp fuzz_common_code.c
 fuzz_alg_hw_rsi_outliers_da_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
 fuzz_alg_hw_rsi_outliers_da_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
-fuzz_alg_hw_rsi_outliers_da_LDADD = ../src/lib/libndpi.a
-fuzz_alg_hw_rsi_outliers_da_LDFLAGS = $(ADDITIONAL_LIBS) $(LIBS)
+fuzz_alg_hw_rsi_outliers_da_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_alg_hw_rsi_outliers_da_LDFLAGS = $(LIBS)
 if HAS_FUZZLDFLAGS
 fuzz_alg_hw_rsi_outliers_da_CXXFLAGS += $(LIB_FUZZING_ENGINE)
 fuzz_alg_hw_rsi_outliers_da_CFLAGS += $(LIB_FUZZING_ENGINE)
@@ -119,8 +119,8 @@ fuzz_alg_hw_rsi_outliers_da_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
 fuzz_alg_jitter_SOURCES = fuzz_alg_jitter.cpp fuzz_common_code.c
 fuzz_alg_jitter_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
 fuzz_alg_jitter_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
-fuzz_alg_jitter_LDADD = ../src/lib/libndpi.a
-fuzz_alg_jitter_LDFLAGS = $(ADDITIONAL_LIBS) $(LIBS)
+fuzz_alg_jitter_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_alg_jitter_LDFLAGS = $(LIBS)
 if HAS_FUZZLDFLAGS
 fuzz_alg_jitter_CXXFLAGS += $(LIB_FUZZING_ENGINE)
 fuzz_alg_jitter_CFLAGS += $(LIB_FUZZING_ENGINE)
@@ -134,8 +134,8 @@ fuzz_alg_jitter_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 fuzz_alg_ses_des_SOURCES = fuzz_alg_ses_des.cpp fuzz_common_code.c
 fuzz_alg_ses_des_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
 fuzz_alg_ses_des_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
-fuzz_alg_ses_des_LDADD = ../src/lib/libndpi.a
-fuzz_alg_ses_des_LDFLAGS = $(ADDITIONAL_LIBS) $(LIBS)
+fuzz_alg_ses_des_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_alg_ses_des_LDFLAGS = $(LIBS)
 if HAS_FUZZLDFLAGS
 fuzz_alg_ses_des_CXXFLAGS += $(LIB_FUZZING_ENGINE)
 fuzz_alg_ses_des_CFLAGS += $(LIB_FUZZING_ENGINE)
@@ -149,8 +149,8 @@ fuzz_alg_ses_des_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 fuzz_ds_patricia_SOURCES = fuzz_ds_patricia.cpp fuzz_common_code.c
 fuzz_ds_patricia_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
 fuzz_ds_patricia_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
-fuzz_ds_patricia_LDADD = ../src/lib/libndpi.a
-fuzz_ds_patricia_LDFLAGS = $(ADDITIONAL_LIBS) $(LIBS)
+fuzz_ds_patricia_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_ds_patricia_LDFLAGS = $(LIBS)
 if HAS_FUZZLDFLAGS
 fuzz_ds_patricia_CXXFLAGS += $(LIB_FUZZING_ENGINE)
 fuzz_ds_patricia_CFLAGS += $(LIB_FUZZING_ENGINE)
@@ -164,8 +164,8 @@ fuzz_ds_patricia_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 fuzz_ds_ahocorasick_SOURCES = fuzz_ds_ahocorasick.cpp fuzz_common_code.c
 fuzz_ds_ahocorasick_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
 fuzz_ds_ahocorasick_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DENABLE_MEM_ALLOC_FAILURES
-fuzz_ds_ahocorasick_LDADD = ../src/lib/libndpi.a
-fuzz_ds_ahocorasick_LDFLAGS = $(ADDITIONAL_LIBS) $(LIBS)
+fuzz_ds_ahocorasick_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_ds_ahocorasick_LDFLAGS = $(LIBS)
 if HAS_FUZZLDFLAGS
 fuzz_ds_ahocorasick_CXXFLAGS += $(LIB_FUZZING_ENGINE)
 fuzz_ds_ahocorasick_CFLAGS += $(LIB_FUZZING_ENGINE)