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 (-3 / +9 lines)
Lines 1147-1152 bootstrap_python() { Link Here
1147
	export PYTHON_DISABLE_SSL=1
1147
	export PYTHON_DISABLE_SSL=1
1148
	export OPT="${CFLAGS}"
1148
	export OPT="${CFLAGS}"
1149
1149
1150
	if [[ ${CHOST} == *-darwin* ]]; then
1151
		PYTHON_DISABLE_MODULES+=" _scproxy"
1152
		sed -i -e '/sys.platform/s/darwin/disabled-darwin/' \
1153
			Lib/urllib/request.py || return 1
1154
	fi
1155
1150
	einfo "Compiling ${A%-*}"
1156
	einfo "Compiling ${A%-*}"
1151
1157
1152
	# some ancient versions of hg fail with "hg id -i", so help
1158
	# some ancient versions of hg fail with "hg id -i", so help
Lines 1954-1960 bootstrap_stage3() { Link Here
1954
		# (CBUILD, BDEPEND) and with the system being built
1960
		# (CBUILD, BDEPEND) and with the system being built
1955
		# (CHOST, RDEPEND).  To correctly bootstrap stage3,
1961
		# (CHOST, RDEPEND).  To correctly bootstrap stage3,
1956
		# PORTAGE_OVERRIDE_EPREFIX as BROOT is needed.
1962
		# PORTAGE_OVERRIDE_EPREFIX as BROOT is needed.
1957
		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
1963
		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{12,11,10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
1958
		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
1964
		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
1959
		FEATURES="${FEATURES} force-prefix" \
1965
		FEATURES="${FEATURES} force-prefix" \
1960
		EMERGE_LOG_DIR="${ROOT}"/var/log \
1966
		EMERGE_LOG_DIR="${ROOT}"/var/log \
Lines 2124-2131 bootstrap_stage3() { Link Here
2124
	# However for some reason this nm doesn't quite get it on newer
2130
	# However for some reason this nm doesn't quite get it on newer
2125
	# platforms at least, resulting in bugs like #598336.  To cater for
2131
	# platforms at least, resulting in bugs like #598336.  To cater for
2126
	# that, get rid of this nm and rely on the host one at this stage
2132
	# that, get rid of this nm and rely on the host one at this stage
2127
	[[ ${CHOST} == *-darwin* ]] && \
2133
	#[[ ${CHOST} == *-darwin* ]] && \
2128
		rm -f "${ROOT}"{,/tmp}/usr/bin/{,${CHOST}-}nm
2134
	#	rm -f "${ROOT}"{,/tmp}/usr/bin/{,${CHOST}-}nm
2129
2135
2130
	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
2136
	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
2131
2137

Return to bug 758167