aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-01-18 14:35:06 -0500
committerMike Frysinger <vapier@gentoo.org>2014-01-18 14:35:06 -0500
commit42f4f3f2ab3851e9d09088c7dc7857bbf027d916 (patch)
treeff11ce30465f5073ace0ea0806ef0438f25c2cb8 /wrappers/emerge-wrapper
parentcrossdev: use new arm64 KEYWORD (diff)
downloadcrossdev-42f4f3f2ab3851e9d09088c7dc7857bbf027d916.tar.gz
crossdev-42f4f3f2ab3851e9d09088c7dc7857bbf027d916.tar.bz2
crossdev-42f4f3f2ab3851e9d09088c7dc7857bbf027d916.zip
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@gentoo.org>
Diffstat (limited to 'wrappers/emerge-wrapper')
-rwxr-xr-xwrappers/emerge-wrapper9
1 files changed, 9 insertions, 0 deletions
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
}