From owner-svn-ports-head@freebsd.org Thu Oct 22 14:57:43 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9718EA1A156; Thu, 22 Oct 2015 14:57:43 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6288019E2; Thu, 22 Oct 2015 14:57:43 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9MEvgUu023548; Thu, 22 Oct 2015 14:57:42 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9MEvgMc023547; Thu, 22 Oct 2015 14:57:42 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201510221457.t9MEvgMc023547@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 22 Oct 2015 14:57:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399986 - head/dns/knot2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Oct 2015 14:57:43 -0000 Author: danfe Date: Thu Oct 22 14:57:42 2015 New Revision: 399986 URL: https://svnweb.freebsd.org/changeset/ports/399986 Log: 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) Modified: head/dns/knot2/Makefile Modified: head/dns/knot2/Makefile ============================================================================== --- head/dns/knot2/Makefile Thu Oct 22 14:57:00 2015 (r399985) +++ head/dns/knot2/Makefile Thu Oct 22 14:57:42 2015 (r399986) @@ -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