sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-12 23:31:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow generate-symbols.sh to actually work.

Browse source 
It splits out symbols to PREFIX as well not LOCALBASE. Fix
check-stagedir.sh for that.
This commit is contained in:
Bryan Drewery 2019-06-26 00:44:55 +00:00
parent f85b566c50
commit 9ec378268c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=505129
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,14 +95,14 @@ setup_plist_seds() {
unset PLIST_SUB_SED unset PLIST_SUB_SED
# Used for generate_plist # Used for generate_plist
sed_files_gen="${sed_portdocsexamples} /^share\/licenses/d; \ sed_files_gen="${sed_portdocsexamples} /^share\/licenses/d; \
\#${LOCALBASE}/lib/debug#d;" \#${PREFIX}/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;"
# 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;" \#${PREFIX}/lib/debug#d;"
sed_dirs="s,^,@dir ,; \ sed_dirs="s,^,@dir ,; \
/^@dir share\/licenses/d;" /^@dir share\/licenses/d;"

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

@ -17,7 +17,7 @@ find ${STAGEDIR} -type f \
> ${ELF_FILES} > ${ELF_FILES}
# Create all of the /usr/local/lib/* dirs # Create all of the /usr/local/lib/* dirs
lib_dir="${STAGEDIR}.debug${PREFIX}/lib/debug" lib_dir="${STAGEDIR}${PREFIX}/lib/debug"
sed -e "s,^${STAGEDIR}${PREFIX}/,${lib_dir}/," -e 's,/[^/]*$,,' \ sed -e "s,^${STAGEDIR}${PREFIX}/,${lib_dir}/," -e 's,/[^/]*$,,' \
${ELF_FILES} | sort -u | xargs mkdir -p ${ELF_FILES} | sort -u | xargs mkdir -p
@ -27,13 +27,12 @@ while read -r staged_elf_file; do
# Strip off filename # Strip off filename
lib_dir_dest="${lib_dir_dest%/*}" lib_dir_dest="${lib_dir_dest%/*}"
# Save symbols to f.debug # Save symbols to f.debug
objcopy --only-keep-debug "${staged_elf_file}" \ debug_file_name="${lib_dir_dest}/${elf_file_name}.debug"
"${lib_dir_dest}/${elf_file_name}.debug" objcopy --only-keep-debug "${staged_elf_file}" "${debug_file_name}"
# Strip and add a reference to f.debug for finding the symbols. # Strip and add a reference to f.debug for finding the symbols.
objcopy --strip-debug --strip-unneeded \ objcopy --strip-debug --strip-unneeded \
--add-gnu-debuglink="${lib_dir_dest}/${elf_file_name}.debug" \ --add-gnu-debuglink="${debug_file_name}" "${staged_elf_file}"
"${staged_elf_file}"
msg "Saved symbols for ${staged_elf_file}" msg "Saved symbols for ${staged_elf_file}"
done < ${ELF_FILES} done < ${ELF_FILES} 3>> ${TMPPLIST}
rm -f ${ELF_FILES} rm -f ${ELF_FILES}