diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2019-06-05 17:35:39 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-05-26 07:02:33 +0100 |
| commit | 9db47dc57db101df474001f903eb99a7c9a44f9e (patch) | |
| tree | b5626e10caa755a1dfa97900913fc3e54bc50735 /prefix-stack-setup | |
| parent | app-portage/prefix-toolkit: BDEPEND on portage, not RDEPEND (diff) | |
| download | prefix-toolkit-9db47dc57db101df474001f903eb99a7c9a44f9e.tar.gz prefix-toolkit-9db47dc57db101df474001f903eb99a7c9a44f9e.tar.bz2 prefix-toolkit-9db47dc57db101df474001f903eb99a7c9a44f9e.zip | |
app-portage/prefix-toolkit: revbumpprefix-toolkit-2
* In prefix-stack, maintain @system set independent of profile, as in
explicitly removing everything found per etc/portage/make.profile, but
adding prefix-toolkit, having RDEPENDs for additional @system packages.
* Do not install libtool into prefix-stack any more, packages really
should not use any installed libtool script, but configure their own.
* In prefix-stack toolchain on Linux, use -isystem to avoid warnings
from installed header files. Remember: This is known to break on AIX.
Package-Manager: Portage-2.3.67-prefix, Repoman-2.3.13
Signed-off-by: Michael Haubenwallner <haubi@gentoo.org>
(cherry picked from commit 37ce4db03cdef74a6ae97466405133bcc85c7b60)
Diffstat (limited to 'prefix-stack-setup')
| -rw-r--r-- | prefix-stack-setup | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/prefix-stack-setup b/prefix-stack-setup index 28e3efa..9fa4a1b 100644 --- a/prefix-stack-setup +++ b/prefix-stack-setup @@ -162,33 +162,29 @@ ebegin "installing required basic packages" export EPREFIX@=@"${CHILD_EPREFIX}" export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}" -# # this -pv is there to avoid the global update output, which is -# # there on the first emerge run. (thus, just cosmetics). -# emerge --pretend --oneshot --nodeps baselayout-prefix - # let baselayout create the directories USE@=@"${USE} build" \ emerge --verbose --nodeps --oneshot \ '>=baselayout-prefix-2.6' - # Record the prefix-toolkit into @world file, as it provides the - # env.d telling the PM to manage this stacked Prefix, but may not - # (unlike baselayout) be part of @system set per the profile. - emerge --verbose --nodeps \ - prefix-toolkit + # In prefix-stack, app-portage/prefix-toolkit does + # install/update an etc/portage/profile/packages file, + # removing all @system packages from current make.profile, + # and adding itself to @system set instead. + emerge --verbose --nodeps --oneshot \ + app-portage/prefix-toolkit + # In prefix-stack, prefix-toolkit does have an RDEPEND on them, + # to hold them in the @system set. emerge --verbose --nodeps --oneshot \ - gentoo-functions \ - elt-patches \ - gnuconfig \ - gcc-config + sys-apps/gentoo-functions \ + app-portage/elt-patches \ + sys-devel/gnuconfig \ + sys-devel/gcc-config # select the stack wrapper profile from gcc-config - env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1 - - # do this _after_ selecting the correct compiler! - emerge --verbose --nodeps --oneshot \ - libtool + env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" \ + "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1 ) eend_exit $? |