From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D9011138247 for ; Sun, 5 Jan 2014 14:42:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 407CFE08A6; Sun, 5 Jan 2014 14:42:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D2D65E08A6 for ; Sun, 5 Jan 2014 14:42:25 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C967833F512 for ; Sun, 5 Jan 2014 14:42:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4A109E54AB for ; Sun, 5 Jan 2014 14:42:23 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1388932829.6dcc94c83bfcfd642d12558bf294e3c6ac0a81da.vapier@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild-helpers/prepstrip X-VCS-Directories: bin/ebuild-helpers/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 6dcc94c83bfcfd642d12558bf294e3c6ac0a81da X-VCS-Branch: master Date: Sun, 5 Jan 2014 14:42:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0c217804-950d-4540-a2b7-91564352b1bb X-Archives-Hash: bed377294bdea199cf491e81c16e576f commit: 6dcc94c83bfcfd642d12558bf294e3c6ac0a81da Author: Mike Frysinger gentoo org> AuthorDate: Sun Jan 5 14:38:59 2014 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Jan 5 14:40:29 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6dcc94c8 prepstrip: do no strip static libs when FEATURES=splitdebug When people have splitdebug enabled, they want debugging info to be available to them. Unfortunately, splitdebug doesn't work with static archives, so we have to leave it in. Stripping of that will be delayed to when the final ELF is linked. --- bin/ebuild-helpers/prepstrip | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip index 64ea80d..2332388 100755 --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@ -339,8 +339,13 @@ do if [[ ${f} == *"current ar archive"* ]] ; then __vecho " ${x:${#ED}}" if ${strip_this} ; then - # hmm, can we split debug/sources for .a ? - ${STRIP} -g "${x}" + # If we have split debug enabled, then do not strip this. + # There is no concept of splitdebug for objects not yet + # linked in (only for finally linked ELFs), so we have to + # retain the debug info in the archive itself. + if ! ${FEATURES_splitdebug} || ${RESTRICT_splitdebug} ; then + ${STRIP} -g "${x}" + fi fi elif [[ ${f} == *"SB executable"* || ${f} == *"SB shared object"* ]] ; then process_elf "${x}" "${inode_link}" ${PORTAGE_STRIP_FLAGS}