diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-06-26 09:07:41 +0800 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-06-26 09:07:41 +0800 |
| commit | 6e992e91cbabf0a4bc270d6d081e982c0ecf8a2d (patch) | |
| tree | 2f960e258799ed9c7b18705ca2b44c9bf3427ec6 /Mk/Scripts | |
| parent | 9ec378268c207cca0567c42c74dfc9ad49d58eb4 (diff) | |
| download | freebsd-ports-gnome-6e992e91cbabf0a4bc270d6d081e982c0ecf8a2d.tar.gz freebsd-ports-gnome-6e992e91cbabf0a4bc270d6d081e982c0ecf8a2d.tar.zst freebsd-ports-gnome-6e992e91cbabf0a4bc270d6d081e982c0ecf8a2d.zip | |
Revert r505129: I still have the wrong version.
Diffstat (limited to 'Mk/Scripts')
| -rw-r--r-- | Mk/Scripts/check-stagedir.sh | 4 | ||||
| -rw-r--r-- | Mk/Scripts/generate-symbols.sh | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Mk/Scripts/check-stagedir.sh b/Mk/Scripts/check-stagedir.sh index 458410cf7690..9037df598e6b 100644 --- a/Mk/Scripts/check-stagedir.sh +++ b/Mk/Scripts/check-stagedir.sh @@ -95,14 +95,14 @@ setup_plist_seds() { unset PLIST_SUB_SED # Used for generate_plist sed_files_gen="${sed_portdocsexamples} /^share\/licenses/d; \ - \#${PREFIX}/lib/debug#d;" + \#${LOCALBASE}/lib/debug#d;" sed_dirs_gen="s,^,@dir ,; \ ${sed_portdocsexamples} \ /^@dir share\/licenses/d;" # These prevent ignoring DOCS/EXAMPLES dirs with sed_portdocsexamples sed_files="/^share\/licenses/d; \ - \#${PREFIX}/lib/debug#d;" + \#${LOCALBASE}/lib/debug#d;" sed_dirs="s,^,@dir ,; \ /^@dir share\/licenses/d;" diff --git a/Mk/Scripts/generate-symbols.sh b/Mk/Scripts/generate-symbols.sh index a4e78ae481c8..942b1738c31d 100644 --- a/Mk/Scripts/generate-symbols.sh +++ b/Mk/Scripts/generate-symbols.sh @@ -17,7 +17,7 @@ find ${STAGEDIR} -type f \ > ${ELF_FILES} # Create all of the /usr/local/lib/* dirs -lib_dir="${STAGEDIR}${PREFIX}/lib/debug" +lib_dir="${STAGEDIR}.debug${PREFIX}/lib/debug" sed -e "s,^${STAGEDIR}${PREFIX}/,${lib_dir}/," -e 's,/[^/]*$,,' \ ${ELF_FILES} | sort -u | xargs mkdir -p @@ -27,12 +27,13 @@ while read -r staged_elf_file; do # Strip off filename lib_dir_dest="${lib_dir_dest%/*}" # Save symbols to f.debug - debug_file_name="${lib_dir_dest}/${elf_file_name}.debug" - objcopy --only-keep-debug "${staged_elf_file}" "${debug_file_name}" + objcopy --only-keep-debug "${staged_elf_file}" \ + "${lib_dir_dest}/${elf_file_name}.debug" # Strip and add a reference to f.debug for finding the symbols. objcopy --strip-debug --strip-unneeded \ - --add-gnu-debuglink="${debug_file_name}" "${staged_elf_file}" + --add-gnu-debuglink="${lib_dir_dest}/${elf_file_name}.debug" \ + "${staged_elf_file}" msg "Saved symbols for ${staged_elf_file}" -done < ${ELF_FILES} 3>> ${TMPPLIST} +done < ${ELF_FILES} rm -f ${ELF_FILES} |