svn commit: r257052 - stable/9

[Bryan Drewery]

Author: bdrewery (ports committer)
Date: Thu Oct 24 10:53:35 2013
New Revision: 257052
URL: http://svnweb.freebsd.org/changeset/base/257052

Log:
  MFC r256842:
  
    Fix 'make delete-old-libs' and 'make check-libs' to delete .debug
    files created by WITH_DEBUG_FILES. Also cleanup .symbols files from
    the period between r244236 when .symbols were supported and r251512
    when they were renamed to .debug.
  
    Only propose to delete a .debug file if the corresponding library
    itself was deleted already.
  
  Approved by:	bapt

Modified:
  stable/9/Makefile.inc1   (contents, props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Thu Oct 24 10:49:55 2013	(r257051)
+++ stable/9/Makefile.inc1	Thu Oct 24 10:53:35 2013	(r257052)
@@ -1574,6 +1574,13 @@ delete-old-libs:
 			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
 			rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
 		fi; \
+		for ext in debug symbols; do \
+		  if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \
+		      "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
+			  rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \
+			      <&3; \
+		  fi; \
+		done; \
 	done
 	@echo ">>> Old libraries removed"
 
@@ -1585,6 +1592,11 @@ check-old-libs:
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			echo "${DESTDIR}/$${file}"; \
 		fi; \
+		for ext in debug symbols; do \
+		  if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
+			  echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \
+		  fi; \
+		done; \
 	done
 
 delete-old-dirs: