From owner-svn-src-stable@freebsd.org Wed Feb 19 14:37:57 2020 Return-Path: Delivered-To: svn-src-stable@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 EE7A023C30E; Wed, 19 Feb 2020 14:37:57 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48N0gn56tpz4NBH; Wed, 19 Feb 2020 14:37:57 +0000 (UTC) (envelope-from bapt@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6AD75A30D; Wed, 19 Feb 2020 14:37:57 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01JEbv8A091738; Wed, 19 Feb 2020 14:37:57 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01JEbuDY091732; Wed, 19 Feb 2020 14:37:56 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202002191437.01JEbuDY091732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 19 Feb 2020 14:37:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358110 - in stable/12/usr.sbin/ntp: libntp ntpdc ntpq X-SVN-Group: stable-12 X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in stable/12/usr.sbin/ntp: libntp ntpdc ntpq X-SVN-Commit-Revision: 358110 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Feb 2020 14:37:58 -0000 Author: bapt Date: Wed Feb 19 14:37:56 2020 New Revision: 358110 URL: https://svnweb.freebsd.org/changeset/base/358110 Log: MFC r352247-r352248 r352247: Remove useless extra definition of libedit flags Note that all the line editor part is done in the libntp r352248: Get the readline header from the installed header instead of the from the source location. 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: stable/12/usr.sbin/ntp/libntp/Makefile stable/12/usr.sbin/ntp/ntpdc/Makefile stable/12/usr.sbin/ntp/ntpq/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/ntp/libntp/Makefile ============================================================================== --- stable/12/usr.sbin/ntp/libntp/Makefile Wed Feb 19 14:32:55 2020 (r358109) +++ stable/12/usr.sbin/ntp/libntp/Makefile Wed Feb 19 14:37:56 2020 (r358110) @@ -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}/ Modified: stable/12/usr.sbin/ntp/ntpdc/Makefile ============================================================================== --- stable/12/usr.sbin/ntp/ntpdc/Makefile Wed Feb 19 14:32:55 2020 (r358109) +++ stable/12/usr.sbin/ntp/ntpdc/Makefile Wed Feb 19 14:37:56 2020 (r358110) @@ -18,8 +18,6 @@ CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ -I${.CURDIR:H} -I${.CURDIR} LIBADD= edit ntp m opts pthread -CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ - -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit .if ${MK_OPENSSL} != "no" LIBADD+= crypto Modified: stable/12/usr.sbin/ntp/ntpq/Makefile ============================================================================== --- stable/12/usr.sbin/ntp/ntpq/Makefile Wed Feb 19 14:32:55 2020 (r358109) +++ stable/12/usr.sbin/ntp/ntpq/Makefile Wed Feb 19 14:37:56 2020 (r358110) @@ -28,9 +28,6 @@ LIBADD+= crypto LIBADD+= md .endif -CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ - -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit - CLEANFILES+= .version version.c version.c: