From owner-svn-src-all@freebsd.org Thu Sep 12 17:53:44 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 52EDFD5891 for ; Thu, 12 Sep 2019 17:53:44 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound3d.ore.mailhop.org (outbound3d.ore.mailhop.org [54.186.57.195]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 46TmbW6bL7z4XsZ for ; Thu, 12 Sep 2019 17:53:43 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1568310822; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=SCg/vOp39sDjunf0oq3rKRR71f5u3kGMfxy5sBSQcThpPM/0nm0fLGOb77Z390htABXvHhyXV3Bs2 5qfgSXNkuZ7A2RYk7xbnZwt3WFt64l+yCsXl96TyBY9r5AXzv0TfetV6eAq7wigjvaAYwHCyUpGAvR CY9MJ3aLkPZiqs1b+A+qLl5Zk1SPiSB1s9ZUS4U97mhjnL0cmH7R8BhmYq92yqqVqJPl4t4lDMN1XF 4WIMXworgXHSfmnQdsYgzxlMlzG1tGq7AFnYYe+aFaOtD7xR+Q7xBaFWUmWCFCmMbQrEoXbp/alyZB XZfifr7spi2uXPl2U3iFSYLDJ2qfbyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:dkim-signature:from; bh=oDKXb0vrHRISBSuCyJ5cYU3OxKMC0OKzn92hIkKuQ9k=; b=Fbq9gEPNx3FtUNNhwaJaL5y/6FXhX3UjQZChoCSZ7NJgVs/1nUnW6UwGkha9cHLYn7Ff5l1QxN5a0 BEW+md8BofKi2TiPWX9DRZeZq0xjMtMqJnjxAU3Zr435p8iDzMG1y3tbi7QJ8+OoZ1ew9TDQGrP9MY +Y1oz/thLyxXLzxxPFQmUHYRM9LGNFX2TeG6qVnDVzLXOQg6qneEfpPQOi/meQ5EoBrSn4MB5Bm1rt yj/OrfKBeevvKUu4Gq5OT5RUFKdrVNZ/DlwCZJY+QuMWi4eKliElyFW5tCZAIpw+LIPsTeuIqdLmBD MlWQNRiDu45EficmmgqQIZWtpoMKcpQ== ARC-Authentication-Results: i=1; outbound3.ore.mailhop.org; spf=softfail smtp.mailfrom=freebsd.org smtp.remote-ip=67.177.211.60; dmarc=none header.from=freebsd.org; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:from; bh=oDKXb0vrHRISBSuCyJ5cYU3OxKMC0OKzn92hIkKuQ9k=; b=K4AofM7KellLBri/qCn1kVhS0IElK87N2L08yEulLgZUpmDwr2muX/HorRRKrxoHyJYTkhDMDDUHI /6Q9SENxdHhoIkafQCGlYC6dbyPFS3JEuU9GYE7UVrGOTOXrxeCP4YSuAG5a9zq7OLE2R9WHOJHe2y fQsv8sw8RzcNINFPCuhIgtaZzGwMrc/0cmYTHiEy5DFgaGwqnSeeUBdqYE7ncGUnZR2I6Fc3VpfYUB 2h6Ygn0QRqy+8FeiwAOflSvj4wafAw+W46BbCyZjnyKdV+GrVlGfwD9C799YYqEO4352Oet2EfZI2f IKvTUOEqtE29cjJTPSUvAbiBgigaP/Q== X-MHO-RoutePath: aGlwcGll X-MHO-User: 403bf193-d586-11e9-b67d-cdd75d6ce7a8 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [67.177.211.60]) by outbound3.ore.mailhop.org (Halon) with ESMTPSA id 403bf193-d586-11e9-b67d-cdd75d6ce7a8; Thu, 12 Sep 2019 17:53:40 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id x8CHrdCV078403; Thu, 12 Sep 2019 11:53:39 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <54c8efce3064f685c1948546bebaccc5f56a09c1.camel@freebsd.org> Subject: Re: svn commit: r352248 - head/usr.sbin/ntp/libntp From: Ian Lepore To: Baptiste Daroussin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Thu, 12 Sep 2019 11:53:38 -0600 In-Reply-To: <201909121546.x8CFkwB7005702@repo.freebsd.org> References: <201909121546.x8CFkwB7005702@repo.freebsd.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 FreeBSD GNOME Team Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 46TmbW6bL7z4XsZ X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-2.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:16509, ipnet:54.186.0.0/15, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2019 17:53:44 -0000 On Thu, 2019-09-12 at 15:46 +0000, Baptiste Daroussin wrote: > Author: bapt > Date: Thu Sep 12 15:46:58 2019 > New Revision: 352248 > URL: https://svnweb.freebsd.org/changeset/base/352248 > > Log: > Get the readline header from the installed header instead of the from the source > location. > How can this possibly be right? One of the hallmarks of our build system is that it is self-contained in the sense that it uses the sources to build the sources, not sources or files from the host machine being used to do the build. -- Ian > With newer import of libedit, the path to be able to access > readline/readline.h > will also include header which name will conflict with some > expected by ntp in > another path and end up breaking the build. > > Modified: > head/usr.sbin/ntp/libntp/Makefile > > Modified: head/usr.sbin/ntp/libntp/Makefile > ===================================================================== > ========= > --- head/usr.sbin/ntp/libntp/Makefile Thu Sep 12 15:44:53 2019 (r352 > 247) > +++ head/usr.sbin/ntp/libntp/Makefile Thu Sep 12 15:46:58 2019 (r352 > 248) > @@ -79,7 +79,7 @@ CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ > -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \ > -I${SRCTOP}/contrib/ntp/sntp/libopts \ > -I${SRCTOP}/lib/libc/${MACHINE_ARCH} \ > - -I${SRCTOP}/lib/libedit/edit \ > + -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit \ > -I${.CURDIR:H} \ > -I${.CURDIR}/ > >