Date: Fri, 26 May 2017 16:03:28 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r318957 - head Message-ID: <201705261603.v4QG3SH0092576@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Fri May 26 16:03:28 2017 New Revision: 318957 URL: https://svnweb.freebsd.org/changeset/base/318957 Log: rm stale ptrace dependencies after r305012 This is similar to r318912, except that ptrace.[sS] was previously a file in the source tree, not a generated assembly wrapper. Check for the existence of ptrace.[sS] in the .depend file to determine if we have to clean it up. This is a bit hackish and will not be left in place indefinitely, but provides a useful example case when investigating a better solution in bmake. Reviewed by: bdrewery Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D10930 Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri May 26 15:57:54 2017 (r318956) +++ head/Makefile.inc1 Fri May 26 16:03:28 2017 (r318957) @@ -710,6 +710,18 @@ _worldtmp: .PHONY # Dependencies cannot cope with certain source tree changes, particularly # with respect to removing source files and replacing generated files. # Handle these cases here in an ad-hoc fashion. +# 20160829 remove stale dependencies for ptrace stub, rewritten in C +# in r305012 +.for f in ptrace +.if exists(${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o) + @if egrep -q '/${f}.[sS]' \ + ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o; then \ + echo Removing stale dependencies for ${f} syscall wrappers; \ + rm -f ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \ + ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*; \ + fi +.endif +.endfor # 20170523 remove stale generated asm files for functions which are no longer # syscalls after r302092 (pipe) and r318736 (others) .for f in getdents lstat mknod pipe stat
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705261603.v4QG3SH0092576>