From 5c744f45c79ace1477422a93f2b9113be6c4636f Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Thu, 11 Sep 2008 17:32:16 +0000 Subject: [PATCH] Merged from trunk -r11499:11503 |11500 |New debugedit support for FEATURES=splitdebug, by Sven Wegener: This | |zmedico|will create new-style buildid symlinks for the splitted debuginfo and| | |also a symlink to the binary that belongs to the debuginfo. Requires | | |debugedit from rpm 5. Old versions of debugedit ignore all unkown | | |command line arguments, so this is a no-op for them. Information: | | |http://fedoraproject.org/wiki/Releases/FeatureBuildId New debugedit | | |tarball: | | |http://dev.gentoo.org/~swegener/distfiles/debugedit-5.0.0.tar.bz2 | |11501 |Remove docs for the proposed unpack() gitweb snapshot extension since| |zmedico|it's unpopular. | |11502 |Remove docs for the proposed eapi* default phase functions since they| |zmedico|are unpopular. | |11503 |Adjust chunk.section.depth and generate.section.toc.level so that the| |zmedico|EAPI 2 draft docs appear on a single page which includes it's own | | |table of contents. | svn path=/main/branches/prefix/; revision=11504 --- bin/prepstrip | 11 +++++ doc/custom.xsl | 2 + doc/package/ebuild/eapi/2.docbook | 73 ------------------------------- 3 files changed, 13 insertions(+), 73 deletions(-) diff --git a/bin/prepstrip b/bin/prepstrip index 8d8dceba9..8ab6b37cd 100755 --- a/bin/prepstrip +++ b/bin/prepstrip @@ -56,12 +56,23 @@ save_elf_debug() { # dont save debug info twice [[ ${x} == *".debug" ]] && return 0 + # this will recompute the build-id, but for now that's ok + local buildid="$( type -P debugedit >/dev/null && debugedit -i "${x}" )" + mkdir -p $(dirname "${y}") ${OBJCOPY} --only-keep-debug "${x}" "${y}" ${OBJCOPY} --add-gnu-debuglink="${y}" "${x}" [[ -g ${x} ]] && chmod go-r "${y}" [[ -u ${x} ]] && chmod go-r "${y}" chmod a-x,o-w "${y}" + + if [[ -n ${buildid} ]] ; then + local buildid_dir="${D}usr/lib/debug/.build-id/${buildid:0:2}" + local buildid_file="${buildid_dir}/${buildid:2}" + mkdir -p "${buildid_dir}" + ln -s "../../${x:${#D}}.debug" "${buildid_file}.debug" + ln -s "/${x:${#D}}" "${buildid_file}" + fi } # The existance of the section .symtab tells us that a binary is stripped. diff --git a/doc/custom.xsl b/doc/custom.xsl index f1692b12f..a7763ecf6 100644 --- a/doc/custom.xsl +++ b/doc/custom.xsl @@ -1,3 +1,5 @@ + + diff --git a/doc/package/ebuild/eapi/2.docbook b/doc/package/ebuild/eapi/2.docbook index 71b11a9bb..b1c6ae511 100644 --- a/doc/package/ebuild/eapi/2.docbook +++ b/doc/package/ebuild/eapi/2.docbook @@ -309,18 +309,6 @@ src_compile() { -
- unpack -
- Gitweb Snapshots - - To aid interoperatiblity with gitweb, files with the suffixes of ;sf=tbz2 - and ;sf=tgz are now treated as .tar.bz2 and .tar.gz archives, respectively. - This allows for ebuilds to consume gitweb snapshots and still use the - default src_unpack implementation. - -
-
Metadata @@ -555,67 +543,6 @@ src_compile() { - - The default phase functions for a particular EAPI are also - accessible as functions having names that start with 'eapi' - followed by the EAPI value. For example, a call to a function - named eapi0_src_compile is equivalent to a call to the - default src_compile implementation that is provided with EAPI 0. - - Default EAPI Phase Functions - - - - - Function Name - - - - - eapi0_pkg_nofetch - - - eapi0_src_unpack - - - eapi0_src_compile - - - eapi0_src_test - - - eapi1_pkg_nofetch - - - eapi1_src_unpack - - - eapi1_src_compile - - - eapi1_src_test - - - eapi2_pkg_nofetch - - - eapi2_src_unpack - - - eapi2_src_prepare - - - eapi2_src_configure - - - eapi2_src_compile - - - eapi2_src_test - - - -
Default Phase Function Alias -- 2.26.2