Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 676534 Details for
Bug 758167
Fix bootstrapping linker/compiler packages for clang-based darwin prefix
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
bootstrap-prefix.sh modifications for stage3
bootstrap-prefix.sh.patch3 (text/plain), 2.00 KB, created by
Jacob Floyd
on 2020-12-03 15:26:36 UTC
(
hide
)
Description:
bootstrap-prefix.sh modifications for stage3
Filename:
MIME Type:
Creator:
Jacob Floyd
Created:
2020-12-03 15:26:36 UTC
Size:
2.00 KB
patch
obsolete
>A couple of minor fixes for stage3 + emerge -e system > >1- We're using llvm/clang 11, so add that (and 12) to the bin paths >2- Python needs a fix that is in the ebuild before python gets rebuilt > in emerge -e system. Without this, portage is dying with _scproxy > errors. This is actually in stage1, because that's when we bootstrap > python. >3- Remove an old hack with nm to see if that fixes the build (it doesn't > but hopefully we still don't need it anymore). > >diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh >index d5e778279c..04f7923021 100755 >--- a/scripts/bootstrap-prefix.sh >+++ b/scripts/bootstrap-prefix.sh >@@ -1147,6 +1147,12 @@ bootstrap_python() { > export PYTHON_DISABLE_SSL=1 > export OPT="${CFLAGS}" > >+ if [[ ${CHOST} == *-darwin* ]]; then >+ PYTHON_DISABLE_MODULES+=" _scproxy" >+ sed -i -e '/sys.platform/s/darwin/disabled-darwin/' \ >+ Lib/urllib/request.py || return 1 >+ fi >+ > einfo "Compiling ${A%-*}" > > # some ancient versions of hg fail with "hg id -i", so help >@@ -1954,7 +1960,7 @@ bootstrap_stage3() { > # (CBUILD, BDEPEND) and with the system being built > # (CHOST, RDEPEND). To correctly bootstrap stage3, > # PORTAGE_OVERRIDE_EPREFIX as BROOT is needed. >- PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \ >+ PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{12,11,10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \ > EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \ > FEATURES="${FEATURES} force-prefix" \ > EMERGE_LOG_DIR="${ROOT}"/var/log \ >@@ -2124,8 +2130,8 @@ bootstrap_stage3() { > # However for some reason this nm doesn't quite get it on newer > # platforms at least, resulting in bugs like #598336. To cater for > # that, get rid of this nm and rely on the host one at this stage >- [[ ${CHOST} == *-darwin* ]] && \ >- rm -f "${ROOT}"{,/tmp}/usr/bin/{,${CHOST}-}nm >+ #[[ ${CHOST} == *-darwin* ]] && \ >+ # rm -f "${ROOT}"{,/tmp}/usr/bin/{,${CHOST}-}nm > > rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 758167
:
676360
|
676363
|
676366
|
676369
|
676375
|
676531
|
676534
|
676591
|
677179
|
677248
|
677251
|
677509
|
677512
|
677515
|
677524
|
677527
|
677530
|
678760
|
868834
|
868835
|
869498
|
869500
|
869577
|
870074
|
870075
|
874610
|
881438
|
884642