Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 758167 | Differences between
and this patch

Collapse All | Expand All

(-)a/scripts/bootstrap-prefix.sh (-4 / +9 lines)
Lines 1149-1154 bootstrap_python() { Link Here
1149
	export PYTHON_DISABLE_SSL=1
1149
	export PYTHON_DISABLE_SSL=1
1150
	export OPT="${CFLAGS}"
1150
	export OPT="${CFLAGS}"
1151
1151
1152
	if [[ ${CHOST} == *-darwin* ]]; then
1153
		PYTHON_DISABLE_MODULES+=" _scproxy"
1154
		sed -i -e '/sys.platform/s/darwin/disabled-darwin/' \
1155
			Lib/urllib/request.py || return 1
1156
	fi
1157
1152
	einfo "Compiling ${A%-*}"
1158
	einfo "Compiling ${A%-*}"
1153
1159
1154
	# some ancient versions of hg fail with "hg id -i", so help
1160
	# some ancient versions of hg fail with "hg id -i", so help
Lines 1927-1933 bootstrap_stage3() { Link Here
1927
		# (CBUILD, BDEPEND) and with the system being built
1933
		# (CBUILD, BDEPEND) and with the system being built
1928
		# (CHOST, RDEPEND).  To correctly bootstrap stage3,
1934
		# (CHOST, RDEPEND).  To correctly bootstrap stage3,
1929
		# PORTAGE_OVERRIDE_EPREFIX as BROOT is needed.
1935
		# PORTAGE_OVERRIDE_EPREFIX as BROOT is needed.
1930
		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
1936
		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{12,11,10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
1931
		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
1937
		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
1932
		FEATURES="${FEATURES} force-prefix" \
1938
		FEATURES="${FEATURES} force-prefix" \
1933
		EMERGE_LOG_DIR="${ROOT}"/var/log \
1939
		EMERGE_LOG_DIR="${ROOT}"/var/log \
Lines 2093-2103 bootstrap_stage3() { Link Here
2093
	# now we have the compiler right there
2099
	# now we have the compiler right there
2094
	unset CXX CPPFLAGS LDFLAGS
2100
	unset CXX CPPFLAGS LDFLAGS
2095
2101
2096
	# On Darwin we have llvm-3.5 at this point, which provides nm.
2102
	# On old Darwin we have llvm-3.5 at this point, which provides nm.
2097
	# However for some reason this nm doesn't quite get it on newer
2103
	# However for some reason this nm doesn't quite get it on newer
2098
	# platforms at least, resulting in bugs like #598336.  To cater for
2104
	# platforms at least, resulting in bugs like #598336.  To cater for
2099
	# that, get rid of this nm and rely on the host one at this stage
2105
	# that, get rid of this nm and rely on the host one at this stage
2100
	[[ ${CHOST} == *-darwin* ]] && \
2106
	[[ ${CHOST} == *-darwin* && ! -d "${ROOT}/MacOSX.sdk" ]] && \
2101
		rm -f "${ROOT}"{,/tmp}/usr/bin/{,${CHOST}-}nm
2107
		rm -f "${ROOT}"{,/tmp}/usr/bin/{,${CHOST}-}nm
2102
2108
2103
	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
2109
	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
2104
- 

Return to bug 758167