|
Lines 503-537
Link Here
|
| 503 |
einfo "Your profile is set to ${fullprofile}." |
503 |
einfo "Your profile is set to ${fullprofile}." |
| 504 |
fi |
504 |
fi |
| 505 |
|
505 |
|
| 506 |
# bug #788613 avoid gcc-11 during stage 2/3 prior sync/emerge -e |
|
|
| 507 |
is-rap && cat >> "${ROOT}"/etc/portage/make.profile/package.mask <<-EOF |
| 508 |
# during bootstrap mask, bug #788613 |
| 509 |
>=sys-devel/gcc-11 |
| 510 |
EOF |
| 511 |
|
| 512 |
# bug #824482 avoid glibc-2.34 |
| 513 |
if is-rap; then |
| 514 |
if ! [ -d "${ROOT}"/etc/portage/package.mask ]; then |
| 515 |
mkdir "${ROOT}"/etc/portage/package.mask |
| 516 |
fi |
| 517 |
|
| 518 |
if ! [ -d "${ROOT}"/etc/portage/package.unmask ]; then |
| 519 |
mkdir "${ROOT}"/etc/portage/package.unmask |
| 520 |
fi |
| 521 |
|
| 522 |
cat >> "${ROOT}"/etc/portage/package.mask/glibc <<-EOF |
| 523 |
# Temporary mask for newer glibc until bootstrapping issues are fixed. |
| 524 |
# bug #824482: Avoid glibc-2.34 for now. See package.unmask/glibc too. |
| 525 |
>=sys-libs/glibc-2.34 |
| 526 |
EOF |
| 527 |
|
| 528 |
cat >> "${ROOT}"/etc/portage/package.unmask/glibc <<-EOF |
| 529 |
# Temporary mask for newer glibc until bootstrapping issues are fixed. |
| 530 |
# bug #824482: Avoid glibc-2.34 for now. See package.mask/glibc too. |
| 531 |
>=sys-libs/glibc-2.34_p1 |
| 532 |
EOF |
| 533 |
fi |
| 534 |
|
| 535 |
# Use package.use to disable in the portage tree to be shared between |
506 |
# Use package.use to disable in the portage tree to be shared between |
| 536 |
# stage2 and stage3. The hack will be undone during tree sync in stage3. |
507 |
# stage2 and stage3. The hack will be undone during tree sync in stage3. |
| 537 |
cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF |
508 |
cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF |
|
Lines 2131-2138
Link Here
|
| 2131 |
${linker} |
2102 |
${linker} |
| 2132 |
) |
2103 |
) |
| 2133 |
# use the new dynamic linker in place of rpath from now on. |
2104 |
# use the new dynamic linker in place of rpath from now on. |
| 2134 |
RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9]) |
2105 |
RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9] | sed s"!${ROOT}/$(get_libdir)/ld-lsb.*!!") |
| 2135 |
export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}" |
2106 |
export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}" |
|
|
2107 |
if [[ ${compiler_type} == gcc ]] ; then |
| 2108 |
# make sure these flags are used even in places that ignore/strip CPPFLAGS/LDFLAGS |
| 2109 |
export LDFLAGS="-B${ROOT}/usr/$(get_libdir) ${LDFLAGS}" |
| 2110 |
export CC="gcc ${CPPFLAGS} ${LDFLAGS}" |
| 2111 |
export CXX="g++ ${CPPFLAGS} ${LDFLAGS}" |
| 2112 |
fi |
| 2136 |
BOOTSTRAP_RAP=yes \ |
2113 |
BOOTSTRAP_RAP=yes \ |
| 2137 |
pre_emerge_pkgs --nodeps "${pkgs[@]}" || return 1 |
2114 |
pre_emerge_pkgs --nodeps "${pkgs[@]}" || return 1 |
| 2138 |
|
2115 |
|
|
Lines 2189-2195
Link Here
|
| 2189 |
|
2166 |
|
| 2190 |
# Undo libgcc_s.so path of stage2 |
2167 |
# Undo libgcc_s.so path of stage2 |
| 2191 |
# Now we have the compiler right there |
2168 |
# Now we have the compiler right there |
| 2192 |
unset CXX CPPFLAGS LDFLAGS |
2169 |
unset CC CXX CPPFLAGS LDFLAGS |
| 2193 |
|
2170 |
|
| 2194 |
rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf |
2171 |
rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf |
| 2195 |
|
2172 |
|
