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.
  
  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        
(r352247)
+++ head/usr.sbin/ntp/libntp/Makefile   Thu Sep 12 15:46:58 2019        
(r352248)
@@ -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}/
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to