kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

generate-symbols: Need @dir entries if PREFIX!=LOCALBASE.

Browse source 
- 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
This commit is contained in:
Bryan Drewery 2019-11-07 20:49:17 +00:00
parent 12e45f433f
commit 19aa5ff42e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=517011
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mk/Scripts/check-stagedir.sh
View file

@ -98,13 +98,15 @@ setup_plist_seds() {
\#${LOCALBASE}/lib/debug#d;" \#${LOCALBASE}/lib/debug#d;"
sed_dirs_gen="s,^,@dir ,; \ sed_dirs_gen="s,^,@dir ,; \
${sed_portdocsexamples} \ ${sed_portdocsexamples} \
/^@dir share\/licenses/d;" /^@dir share\/licenses/d; \
\#@dir ${LOCALBASE}/lib/debug#d;"
# These prevent ignoring DOCS/EXAMPLES dirs with sed_portdocsexamples # These prevent ignoring DOCS/EXAMPLES dirs with sed_portdocsexamples
sed_files="/^share\/licenses/d; \ sed_files="/^share\/licenses/d; \
\#${LOCALBASE}/lib/debug#d;" \#${LOCALBASE}/lib/debug#d;"
sed_dirs="s,^,@dir ,; \ sed_dirs="s,^,@dir ,; \
/^@dir share\/licenses/d;" /^@dir share\/licenses/d; \
\#@dir ${LOCALBASE}/lib/debug#d;"
} }

9
Mk/Scripts/generate-symbols.sh
View file

@ -6,7 +6,7 @@
# the symbols to LOCALBASE/lib/debug/<original path>. # the symbols to LOCALBASE/lib/debug/<original path>.
# For example: # For example:
# /var/qmail/bin/qmaild -> /usr/local/lib/debug/var/qmail/bin/qmaild.debug # /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" LIB_DIR_PREFIX="${LOCALBASE}/lib/debug"
msg() { msg() {
@ -43,4 +43,11 @@ while read -r staged_elf_file; do
echo "${debug_file_name#${STAGEDIR}}" >&3 echo "${debug_file_name#${STAGEDIR}}" >&3
done < ${ELF_FILES} 3>> ${TMPPLIST} 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,^,@dir ,' \
>> ${TMPPLIST}
fi
rm -f ${ELF_FILES} rm -f ${ELF_FILES}