Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sys-apps/portage: don't fail on start of stage3 on clang macos #33

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 0 additions & 80 deletions sys-apps/portage/files/portage-2.3.62-prefix-stack.patch

This file was deleted.

16 changes: 16 additions & 0 deletions sys-apps/portage/files/portage-3.0.49-prefix-stage2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
During first part of stage3, some programs are installed from EPREFIX/tmp to EPREFIX which break this qa check
The check I'm adding is heavy-handed, but I don't know how to fix this better

TODO: check whether portage-3.0.30-prefix-stack.patch fixes the same issue - I don't understand what that patch is doing

--- a/bin/install-qa-check.d/05prefix
+++ b/bin/install-qa-check.d/05prefix
@@ -95,6 +95,8 @@ install_qa_check_prefix() {
# reasons
sed -i -e '1s:^#! \?'"${line[0]}"':#!'"${EPREFIX}"${line[0]}':' "${rf}"
continue
+ elif [[ -n "${PORTAGE_OVERRIDE_EPREFIX}" ]] ; then
+ continue
else
# this is definitely wrong: script in ${PATH} and invalid shebang
echo "${fn#${D}}:${line[0]} (script ${fn##*/} installed in PATH but interpreter ${line[0]} not found)" \
1 change: 1 addition & 0 deletions sys-apps/portage/portage-3.0.49.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ python_prepare_all() {
# disabled in 3.0.24: does not apply, while useful, rarely used if ever
# "${FILESDIR}"/${PN}-3.0.30-ebuildshell.patch # 155161
"${FILESDIR}"/${PN}-3.0.55.1-interrevisions.patch # 832062
"${FILESDIR}"/${PN}-3.0.49-prefix-stage2.patch # 758167
)

distutils-r1_python_prepare_all
Expand Down
1 change: 1 addition & 0 deletions sys-apps/portage/portage-3.0.56.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ S="${WORKDIR}"/prefix-${P}

PATCHES=(
"${FILESDIR}"/${PN}-3.0.55.1-interrevisions.patch
"${FILESDIR}"/${PN}-3.0.49-prefix-stage2.patch
)

pkg_pretend() {
Expand Down
Loading