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

Collapse All | Expand All

(-)portage-2.0.50_pre20.ebuild.old (-8 / +16 lines)
Lines 33-49 Link Here
33
33
34
src_unpack() {
34
src_unpack() {
35
	unpack ${A}
35
	unpack ${A}
36
	cd ${S}
36
	cd ${S}/src/sandbox-1.1
37
	epatch ${FILESDIR}/sandbox-amd64.patch
37
}
38
}
38
39
39
src_compile() {
40
src_compile() {
41
	SB_CFLAGS="$(echo "${CFLAGS}" | \
42
		sed -e 's:.*\(-march=[^[:space:]\"]*\).*:\1:p; t exit; s:.*\(-mcpu=[^[:space:]\"]*\).*:\1:p; :exit; D')"
43
40
	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
44
	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
41
	cd ${S}/src/sandbox-1.1
45
	cd ${S}/src/sandbox-1.1
42
	if [ "${ARCH}" = "x86" ]; then
46
#	if [ "${ARCH}" = "x86" ]; then
43
		make CFLAGS="-march=i386 -O1 -pipe" || die
47
#		make CFLAGS="-march=i386 -O1 -pipe" || die
44
	else
48
#	else
45
		make || die
49
#		make || die
46
	fi
50
#	fi
51
	make CFLAGS="${SB_CFLAGS} -O1 -pipe" \
52
		HAVE_64BIT_ARCH="$(use amd64 && use multilib)" || die
47
	cd ${S}/bin
53
	cd ${S}/bin
48
}
54
}
49
55
Lines 112-119 Link Here
112
	#install sandbox
118
	#install sandbox
113
	cd ${S}/src/sandbox-1.1
119
	cd ${S}/src/sandbox-1.1
114
	make clean
120
	make clean
115
	make DESTDIR=${D} install || die "Failed to compile sandbox"
121
#	make DESTDIR=${D} install || die "Failed to compile sandbox"
116
122
	make DESTDIR=${D} \
123
		HAVE_64BIT_ARCH="$(use amd64 && use multilib)" \
124
		install || die "Failed to compile sandbox"
117
	#symlinks
125
	#symlinks
118
	dodir /usr/bin /usr/sbin
126
	dodir /usr/bin /usr/sbin
119
	dosym ../lib/portage/bin/emerge /usr/bin/emerge
127
	dosym ../lib/portage/bin/emerge /usr/bin/emerge

Return to bug 32963