svn commit: r359286 - head

[Ed Maste]

Author: emaste
Date: Tue Mar 24 21:37:34 2020
New Revision: 359286
URL: https://svnweb.freebsd.org/changeset/base/359286

Log:
  Makefile.inc1: remove old (2018) stale dependency hacks
  
  We handle a number of stale dependency issues on an ad-hoc basis, in
  order to support ongoing NO_CLEAN builds.  These hacks do not need to
  be maintained indefinitely; now remove those for issues that are more
  than a year old.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Mar 24 21:28:48 2020	(r359285)
+++ head/Makefile.inc1	Tue Mar 24 21:37:34 2020	(r359286)
@@ -962,9 +962,8 @@ _cleanobj_fast_depend_hack: .PHONY
 	fi
 .endif
 .endfor
-# 20180604  r334626  brk sbrk
 # 20190916  r352703  shm_open
-.for f in brk sbrk shm_open
+.for f in shm_open
 	@if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \
 	    egrep -qw '${f}\.[sS]' ${OBJTOP}/lib/libc/.depend.${f}.o; then \
 		echo "Removing stale dependencies for ${f} syscall wrappers"; \
@@ -972,37 +971,6 @@ _cleanobj_fast_depend_hack: .PHONY
 		   ${_LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \
 	fi
 .endfor
-# 20181013  r339348  bcopy reimplemented as .c
-.for f in bcopy memcpy memmove
-	@if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \
-	    egrep -qw 'bcopy\.[sS]' ${OBJTOP}/lib/libc/.depend.${f}.o; then \
-		echo "Removing stale dependencies for bcopy"; \
-		rm -f ${OBJTOP}/lib/libc/.depend.${f}.* \
-		   ${_LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \
-	fi
-.endfor
-# 20181115  r340463  bzero reimplemented as .c
-	@if [ -e "${OBJTOP}/lib/libc/.depend.bzero.o" ] && \
-	    egrep -qw 'bzero\.[sS]' ${OBJTOP}/lib/libc/.depend.bzero.o; then \
-		echo "Removing stale dependencies for bzero"; \
-		rm -f ${OBJTOP}/lib/libc/.depend.bzero.* \
-		   ${_LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.bzero.*}; \
-	fi
-# 20181009 track migration from ntp's embedded libevent to updated one
-	@if [ -e "${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o" ] && \
-	    egrep -q 'contrib/ntp/sntp/libevent/bufferevent_openssl.c' \
-	    ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o ; then \
-		echo "Removing stale libevent dependencies"; \
-		rm -f ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.*; \
-	fi
-
-# 20181209  r341759 track migration across wpa update
-	@if [ -e "${OBJTOP}/usr.sbin/wpa/wpa_supplicant/.depend.rrm.o" ] && \
-	    egrep -q 'src/ap/rrm.c' \
-	    ${OBJTOP}/usr.sbin/wpa/wpa_supplicant/.depend.rrm.o; then \
-		echo "Removing stale wpa dependencies"; \
-		rm -f ${OBJTOP}/usr.sbin/wpa/*/.depend*; \
-	fi
 
 _worldtmp: .PHONY
 	@echo