svn commit: r341796 - head

[Ed Maste]

Author: emaste
Date: Mon Dec 10 14:50:11 2018
New Revision: 341796
URL: https://svnweb.freebsd.org/changeset/base/341796

Log:
  Clean stale wpa dependencies and objects after r341759
  
  The wpa update added some source files with the same name as a file in
  another directory (found via .PATH in the previous version).  Having a
  stale entry in a .depend file means the new file won't be built, so test
  for this case and if found remove all of wpa's dependency files.
  
  MFC with:	r341759
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon Dec 10 14:39:21 2018	(r341795)
+++ head/Makefile.inc1	Mon Dec 10 14:50:11 2018	(r341796)
@@ -977,6 +977,14 @@ _cleanobj_fast_depend_hack: .PHONY
 		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 and objects"; \
+		rm -f ${OBJTOP}/usr.sbin/wpa/*/.depend*; \
+	fi
+
 _worldtmp: .PHONY
 	@echo
 	@echo "--------------------------------------------------------------"