[gentoo-commits] proj/crossdev:master commit in: wrappers/

["Mike Frysinger" <vapier@gentoo.org>]

commit:     42f4f3f2ab3851e9d09088c7dc7857bbf027d916
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 19:35:06 2014 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> 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 <vapier <AT> 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
 }