For bug #186337, show an ewarn message if FEATURES=installsources is enabled but...

svn path=/main/branches/2.1.2/; revision=7382

diff --git a/bin/prepstrip b/bin/prepstrip
index c5b23d3a80a36ca783fd73066108fe32e26ad482..178b5c173a30123a11b1af38392646bf3852afe2 100755 (executable)
--- a/bin/prepstrip
+++ b/bin/prepstrip
@@ -25,6 +25,11 @@ type -P -- ${OBJCOPY} > /dev/null || OBJCOPY=objcopy
 export SAFE_STRIP_FLAGS="--strip-unneeded"
 export PORTAGE_STRIP_FLAGS=${PORTAGE_STRIP_FLAGS-${SAFE_STRIP_FLAGS} -R .comment}
 
+if hasq installsources ${FEATURES} && ! type -P debugedit >/dev/null ; then
+       ewarn "FEATURES=installsources is enabled but the debugedit binary could not"
+       ewarn "be found. This feature will not work unless debugedit is installed!"
+fi
+
 save_elf_sources() {
        hasq installsources ${FEATURES} || return 0
        type -P debugedit >/dev/null || return 0

diff --git a/cnf/make.conf b/cnf/make.conf
index 4db05d876458b7be645138502cef6ab869dfe6bf..d4094786b64f939ea4c60ae7caa89cfe9ff80c99 100644 (file)
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -262,6 +262,11 @@
 #  'distlocks'   enables distfiles locking using fcntl or hardlinks. This
 #                is enabled by default. Tools exist to help clean the locks
 #                after crashes: /usr/lib/portage/bin/clean_locks.
+#  'installsources'
+#                Install source code into /usr/src/debug/${CATEGORY}/${PF}
+#                (also see 'splitdebug'). This feature works only if debugedit
+#                is installed and CFLAGS is set to include debug information
+#                (such as with the -ggdb flag).
 #  'test'        causes ebuilds to perform testing phases if they are capable
 #                of it. Some packages support this automatically via makefiles.
 #  'metadata-transfer'
@@ -275,6 +280,10 @@
 #  'parallel-fetch'
 #                do fetching in parallel to compilation
 #  'sandbox'     enables sandboxing when running emerge and ebuild.
+#  'splitdebug'  Prior to stripping ELF etdyn and etexec files, the debugging
+#                info is stored for later use by various debuggers.  This
+#                feature is disabled by 'nostrip'.  For installation of source
+#                code, see 'installsources'.
 #  'strict'      causes portage to react strongly to conditions that are
 #                potentially dangerous, like missing/incorrect Manifest files.
 #  'stricter'    causes portage to react strongly to conditions that may