From 0f25be1a1e669ff714d879b01bc6ec331de72ad4 Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Thu, 22 Oct 2015 14:57:42 +0000 Subject: [PATCH] Unbreak the build with (non-default) DNSTAP option set. The root cause here is that `kdig_CPPFLAGS += $(DNSTAP_CFLAGS)' line is missing from the `src/Makefile.am' file (and thus pre-generated `src/Makefile.in') which should contain "$libfstrm_CFLAGS $libprotobuf_c_CFLAGS" set by configure script. As I'd rather avoid patching `src/Makefile.in' and don't want to request regeneration thereof, provide DNSTAP_CPPFLAGS explicitly for the moment, while ideally this bug should be fixed upstream. Add an accompanying XXX comment about it. PR: 203931 (partially) --- dns/knot2/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dns/knot2/Makefile b/dns/knot2/Makefile index fb8825a23f72..2b5425586076 100644 --- a/dns/knot2/Makefile +++ b/dns/knot2/Makefile @@ -50,6 +50,12 @@ OPTIONS_DEFINE= DNSTAP FASTPARSER IDN DNSTAP_DESC= dnstap support (see dnstap.info) DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_LIB_DEPENDS= libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c +# XXX: because `kdig_CPPFLAGS += $(DNSTAP_CFLAGS)' line is missing from +# `src/Makefile.am' file (and thus pre-generated `src/Makefile.in') which +# should contain "$libfstrm_CFLAGS $libprotobuf_c_CFLAGS" set by configure +# script, provide it here explicitly as patching those files would result +# in higher line count. Ideally this bug should be fixed upstream. +DNSTAP_CPPFLAGS= -I${LOCALBASE}/include FASTPARSER_DESC= Fast zone parser (demanding compilation) FASTPARSER_CONFIGURE_ENABLE= fastparser