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 A2DB51387B1 for ; Sat, 18 Jan 2014 19:37:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51466E0C35; Sat, 18 Jan 2014 19:37:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE6F4E0C35 for ; Sat, 18 Jan 2014 19:37:53 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED3A933F8EB for ; Sat, 18 Jan 2014 19:37:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 33F9318096 for ; Sat, 18 Jan 2014 19:37:51 +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: <1390073706.42f4f3f2ab3851e9d09088c7dc7857bbf027d916.vapier@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/ X-VCS-Repository: proj/crossdev X-VCS-Files: wrappers/emerge-wrapper X-VCS-Directories: wrappers/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 42f4f3f2ab3851e9d09088c7dc7857bbf027d916 X-VCS-Branch: master Date: Sat, 18 Jan 2014 19:37:51 +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: 79900410-ba38-48ea-a0f3-9bab3d650cab X-Archives-Hash: d509ca747638dadd879be4767b2c8410 commit: 42f4f3f2ab3851e9d09088c7dc7857bbf027d916 Author: Mike Frysinger gentoo org> AuthorDate: Sat Jan 18 19:35:06 2014 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Jan 18 19:35:06 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=42f4f3f2 emerge-wrapper: mark the C library/linux-headers as provided in the sysroot Since the cross-xxx/{glibc,linux-headers} packages are installed into the sysroot, we don't want to try and install them in here too as they'll run into file collisions. So automatically add them to package.provided. Signed-off-by: Mike Frysinger gentoo.org> --- wrappers/emerge-wrapper | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper index 545e8c2..7bcbcf0 100755 --- a/wrappers/emerge-wrapper +++ b/wrappers/emerge-wrapper @@ -60,6 +60,15 @@ cross_wrap_etc() -e "s:__CBUILD__:${CBUILD}:g" \ "${conf}" + # Try to figure out the libc version & os headers to avoid installing over top of it. + # XXX: Would be nice to use virtual/libc and virtual/os-headers here ... + cd "${SYSROOT}/etc/portage" + mkdir -p profile + qlist -ICv "cross-${CHOST}/" | \ + egrep '/(linux-headers|glibc|musl|newlib|uclibc)-' | \ + sed "s:^[^/]*:sys-libs:" \ + > profile/package.provided + return 0 }