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 (-8 / +7 lines)
Lines 1169-1178 bootstrap_python() { Link Here
1169
		--disable-shared \
1169
		--disable-shared \
1170
		--libdir="${ROOT}"/tmp/usr/lib \
1170
		--libdir="${ROOT}"/tmp/usr/lib \
1171
		${myconf} || return 1
1171
		${myconf} || return 1
1172
	$MAKE ${MAKEOPTS} || return 1
1172
	v $MAKE ${MAKEOPTS} || return 1
1173
1173
1174
	einfo "Installing ${A%-*}"
1174
	einfo "Installing ${A%-*}"
1175
	$MAKE -k install || echo "??? Python failed to install *sigh* continuing anyway"
1175
	v $MAKE -k install || echo "??? Python failed to install *sigh* continuing anyway"
1176
	cd "${ROOT}"/tmp/usr/bin
1176
	cd "${ROOT}"/tmp/usr/bin
1177
	ln -sf python${PV%.*} python
1177
	ln -sf python${PV%.*} python
1178
	cd "${ROOT}"/tmp/usr/lib
1178
	cd "${ROOT}"/tmp/usr/lib
Lines 1180-1186 bootstrap_python() { Link Here
1180
	# http://forums.gentoo.org/viewtopic-p-6890526.html
1180
	# http://forums.gentoo.org/viewtopic-p-6890526.html
1181
	rm -f libpython${PV%.*}.a
1181
	rm -f libpython${PV%.*}.a
1182
1182
1183
	einfo "${A%-*} bootstrapped"
1183
	einfo "${A%-*}-${PV} bootstrapped"
1184
}
1184
}
1185
1185
1186
bootstrap_zlib_core() {
1186
bootstrap_zlib_core() {
Lines 1242-1251 bootstrap_zlib_core() { Link Here
1242
1242
1243
	einfo "Compiling ${A%-*}"
1243
	einfo "Compiling ${A%-*}"
1244
	CHOST= ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/tmp/usr || return 1
1244
	CHOST= ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/tmp/usr || return 1
1245
	$MAKE "${makeopts[@]}" || return 1
1245
	v $MAKE "${makeopts[@]}" || return 1
1246
1246
1247
	einfo "Installing ${A%-*}"
1247
	einfo "Installing ${A%-*}"
1248
	$MAKE "${makeopts[@]}" -j1 install || return 1
1248
	v $MAKE "${makeopts[@]}" -j1 install || return 1
1249
1249
1250
	# this lib causes issues when emerging python again on Solaris
1250
	# this lib causes issues when emerging python again on Solaris
1251
	# because the tmp lib path is in the library search path there
1251
	# because the tmp lib path is in the library search path there
Lines 1263-1269 bootstrap_zlib_core() { Link Here
1263
		rm -f "${ROOT}"/tmp/usr/lib/libz.so.1
1263
		rm -f "${ROOT}"/tmp/usr/lib/libz.so.1
1264
	fi
1264
	fi
1265
1265
1266
	einfo "${A%-*} bootstrapped"
1266
	einfo "${A%-*}-${PV} bootstrapped"
1267
}
1267
}
1268
1268
1269
bootstrap_zlib() {
1269
bootstrap_zlib() {
Lines 2910-2916 EOF Link Here
2910
	export CHOST=$(portageq envvar CHOST)
2910
	export CHOST=$(portageq envvar CHOST)
2911
2911
2912
	# after stage1 and stage2 we should have a bash of our own, which
2912
	# after stage1 and stage2 we should have a bash of our own, which
2913
	# is preferably over the host-provided one, because we know it can
2913
	# is preferable over the host-provided one, because we know it can
2914
	# deal with the bash-constructs we use in stage3 and onwards
2914
	# deal with the bash-constructs we use in stage3 and onwards
2915
	hash -r
2915
	hash -r
2916
2916
2917
- 

Return to bug 758167