svn commit: r517011 - head/Mk/Scripts

[Bryan Drewery]

Author: bdrewery
Date: Thu Nov  7 20:49:17 2019
New Revision: 517011
URL: https://svnweb.freebsd.org/changeset/ports/517011

Log:
  generate-symbols: Need @dir entries if PREFIX!=LOCALBASE.
  
  - makeplist/check-plist: Don't suggest or complain about @dir entries
    for debug symbols added by this script. Same as is done for the
    debug symbols themselves.
  
  Sponsored by:	DellEMC

Modified:
  head/Mk/Scripts/check-stagedir.sh
  head/Mk/Scripts/generate-symbols.sh

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Thu Nov  7 20:29:42 2019	(r517010)
+++ head/Mk/Scripts/check-stagedir.sh	Thu Nov  7 20:49:17 2019	(r517011)
@@ -98,13 +98,15 @@ setup_plist_seds() {
 	    \#${LOCALBASE}/lib/debug#d;"
 	sed_dirs_gen="s,^, at dir ,; \
 	    ${sed_portdocsexamples} \
-	    /^@dir share\/licenses/d;"
+	    /^@dir share\/licenses/d; \
+	    \#@dir ${LOCALBASE}/lib/debug#d;"
 
 	# These prevent ignoring DOCS/EXAMPLES dirs with sed_portdocsexamples
 	sed_files="/^share\/licenses/d; \
 	    \#${LOCALBASE}/lib/debug#d;"
 	sed_dirs="s,^, at dir ,; \
-	    /^@dir share\/licenses/d;"
+	    /^@dir share\/licenses/d; \
+	    \#@dir ${LOCALBASE}/lib/debug#d;"
 
 }
 

Modified: head/Mk/Scripts/generate-symbols.sh
==============================================================================
--- head/Mk/Scripts/generate-symbols.sh	Thu Nov  7 20:29:42 2019	(r517010)
+++ head/Mk/Scripts/generate-symbols.sh	Thu Nov  7 20:49:17 2019	(r517011)
@@ -6,7 +6,7 @@
 # the symbols to LOCALBASE/lib/debug/<original path>.
 # For example:
 # /var/qmail/bin/qmaild -> /usr/local/lib/debug/var/qmail/bin/qmaild.debug
-# /usr/local/bin/ssh    -> /usr/local/lib/debug/usr/local/bin/ssh
+# /usr/local/bin/ssh    -> /usr/local/lib/debug/usr/local/bin/ssh.debug
 LIB_DIR_PREFIX="${LOCALBASE}/lib/debug"
 
 msg() {
@@ -42,5 +42,12 @@ while read -r staged_elf_file; do
 	msg "Saved symbols for ${staged_elf_file}"
 	echo "${debug_file_name#${STAGEDIR}}" >&3
 done < ${ELF_FILES} 3>> ${TMPPLIST}
+
+# Need @dir entries if PREFIX != LOCALBASE
+if [ "${PREFIX}" != "${LOCALBASE}" ] && [ -d "${lib_dir}" ]; then
+	find -sd "${lib_dir}" -type d | sed -e "s,^${STAGEDIR},," \
+	    -e 's,^, at dir ,' \
+	    >> ${TMPPLIST}
+fi
 
 rm -f ${ELF_FILES}