Support RESTRICT=splitdebug

diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip
index eda2212667243f1f14c4f400f6a0626c5fd2b923..66aa734173c23d2cb64c2481eac7ca8f847461b2 100755 (executable)
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@ -16,7 +16,7 @@ exp_tf() {
        done
 }
 exp_tf FEATURES compressdebug installsources nostrip splitdebug xattr
-exp_tf RESTRICT binchecks installsources strip
+exp_tf RESTRICT binchecks installsources splitdebug strip
 
 if ! ___eapi_has_prefix_variables; then
        EPREFIX= ED=${D}
@@ -120,6 +120,7 @@ save_elf_sources() {
 # Usage: save_elf_debug <elf> [splitdebug file]
 save_elf_debug() {
        ${FEATURES_splitdebug} || return 0
+       ${RESTRICT_splitdebug} && return 0
 
        # NOTE: Debug files must be installed in
        # ${EPREFIX}/usr/lib/debug/${EPREFIX} (note that ${EPREFIX} occurs

diff --git a/bin/repoman b/bin/repoman
index a2be38008c812bd84a8b23bd09f450bdff1e157b..c55fb04f6073f502664e572f7c52210cf2821b13 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -446,7 +446,7 @@ for x in missingvars:
 
 valid_restrict = frozenset(["binchecks", "bindist",
        "fetch", "installsources", "mirror",
-       "primaryuri", "strip", "test", "userpriv"])
+       "primaryuri", "splitdebug", "strip", "test", "userpriv"])
 
 live_eclasses = frozenset([
        "bzr",

diff --git a/man/ebuild.5 b/man/ebuild.5
index 7e858e0d7297bfee5a44cf1fafb178bae3fe83c3..749a3f3e1c37f46b1c16375280e248d7e82e571d 100644 (file)
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -676,6 +676,11 @@ files in \fBSRC_URI\fR will not be downloaded from the \fBGENTOO_MIRRORS\fR.
 .I primaryuri
 fetch from URIs in \fBSRC_URI\fR before \fBGENTOO_MIRRORS\fR.
 .TP
+.I splitdebug
+Disables splitdebug for specific packages. This is for packages with
+binaries that trigger problems with splitdebug, such as file\-collisions
+between symlinks in /usr/lib/debug/.build-id (triggered by bundled libraries).
+.TP
 .I strip
 final binaries/libraries will not be stripped of debug symbols.
 .TP