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

Collapse All | Expand All

(-)bootstrap-prefix.sh.orig (+9 lines)
Lines 1115-1120 Link Here
1115
			pkgs=( ${pkgs[@]} sys-apps/darwin-miscutils sys-libs/csu )
1115
			pkgs=( ${pkgs[@]} sys-apps/darwin-miscutils sys-libs/csu )
1116
			case "$(gcc --version)" in
1116
			case "$(gcc --version)" in
1117
				*"(GCC) 4.2.1 "*|*"Apple LLVM version 5.0"*)
1117
				*"(GCC) 4.2.1 "*|*"Apple LLVM version 5.0"*)
1118
					# The next 3 lines are a nasty hack to
1119
					# workaround bug 491098
1120
					echo "post_src_prepare() { epatch_user; }" >> "${PORTDIR}/profiles/prefix/profile.bashrc"
1121
					mkdir -p "${EPREFIX}"/etc/portage/patches/sys-devel/gcc-apple
1122
					"${EPREFIX}"/tmp/usr/bin/wget ${GENTOO_MIRRORS}/experimental/prefix/patches/gcc-apple-4.2.1-inline.patch -O "${EPREFIX}"/etc/portage/patches/sys-devel/gcc-apple/gcc-apple-4.2.1-inline.patch
1118
					pkgs=( ${pkgs[@]} sys-devel/binutils-apple )
1123
					pkgs=( ${pkgs[@]} sys-devel/binutils-apple )
1119
					;;
1124
					;;
1120
				*"(GCC) 4.0.1 "*)
1125
				*"(GCC) 4.0.1 "*)
Lines 1202-1207 Link Here
1202
	esac
1207
	esac
1203
1208
1204
	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
1209
	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
1210
	rm -rf "${EPREFIX}"/etc/portage/patches
1211
	# Ensure GNU sed
1212
	"${EPREFIX}"/tmp/usr/bin/sed -i '/epatch_user/d' \
1213
		"${PORTDIR}/profiles/prefix/profile.bashrc"
1205
1214
1206
	# --oneshot
1215
	# --oneshot
1207
	local pkgs=(
1216
	local pkgs=(

Return to bug 491098