svn commit: r358110 - in stable/12/usr.sbin/ntp: libntp ntpdc ntpq

Baptiste Daroussin bapt at FreeBSD.org
Wed Feb 19 14:37:58 UTC 2020


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:


More information about the svn-src-all mailing list