| 1 |
commit: be327d4e749d3cc8ece772c87843b64d856cbbf0 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 30 07:30:43 2019 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 30 07:30:43 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=be327d4e |
| 7 |
|
| 8 |
wrappers/emerge-wrapper: drop population of profile/package.provided |
| 9 |
|
| 10 |
'profile/package.provided' is created empty for quite a while |
| 11 |
because wrapper init is called before any cross-* package gets merged. |
| 12 |
|
| 13 |
Let's drop that completely and focus on always installing |
| 14 |
headers and libc into target. |
| 15 |
|
| 16 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 17 |
|
| 18 |
wrappers/emerge-wrapper | 10 ---------- |
| 19 |
1 file changed, 10 deletions(-) |
| 20 |
|
| 21 |
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper |
| 22 |
index d084a96..381214e 100755 |
| 23 |
--- a/wrappers/emerge-wrapper |
| 24 |
+++ b/wrappers/emerge-wrapper |
| 25 |
@@ -84,16 +84,6 @@ cross_wrap_etc() |
| 26 |
-e "s:__CBUILD__:${CBUILD}:g" \ |
| 27 |
"${confs[@]}" |
| 28 |
|
| 29 |
- # Try to figure out the libc version & os headers to avoid installing over top of it. |
| 30 |
- # XXX: Would be nice to use virtual/libc and virtual/os-headers here ... |
| 31 |
- # TODO: this does not work as crossdev calls --init before any packages are installed |
| 32 |
- cd "${SYSROOT}/etc/portage" |
| 33 |
- mkdir -p profile |
| 34 |
- qlist -ICv "cross-${CHOST}/" | \ |
| 35 |
- egrep '/(linux-headers|glibc|musl|newlib|uclibc)-' | \ |
| 36 |
- sed "s:^[^/]*:sys-libs:" \ |
| 37 |
- > profile/package.provided |
| 38 |
- |
| 39 |
return 0 |
| 40 |
} |
Archives