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.51_pre7.ebuild.old (-3 / +21 lines)
Lines 32-37 Link Here
32
	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
32
	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
33
}
33
}
34
34
35
check_multilib() {
36
	use !multilib && return
37
	echo "main() {}" > ./check-multilib.c
38
	/usr/bin/gcc -m32 -o ./check-multilib ./check-multilib.c > /dev/null 2>&1
39
	if [ "$?" == 0 ]; then
40
		einfo "Found valid multilib environment."
41
		einfo "Building with multilib support."
42
		export MULTILIB="1"
43
	else
44
		ewarn "No valid multilib environment found!"
45
		ewarn "Building without multilib support. If"
46
		ewarn "you want to have multilib support,"
47
		ewarn "emerge gcc with \"multilib\" in your"
48
		ewarn "useflags."
49
		sleep 5
50
	fi
51
}
52
35
src_unpack() {
53
src_unpack() {
36
	unpack ${A}
54
	unpack ${A}
37
	cd ${S}
55
	cd ${S}
Lines 45-52 Link Here
45
			make CFLAGS="-march=i386 -O1 -pipe" || die
63
			make CFLAGS="-march=i386 -O1 -pipe" || die
46
			;;
64
			;;
47
		"amd64") 
65
		"amd64") 
48
			use multilib && einfo "Building with multilib support on amd64"
66
		check_multilib
49
			make CFLAGS="-O2 -pipe" HAVE_64BIT_ARCH="`use multilib`" || die
67
		make CFLAGS="-O2 -pipe" HAVE_64BIT_ARCH="${MULTILIB}" || die
50
			;;
68
			;;
51
		*)
69
		*)
52
		make || die
70
		make || die
Lines 125-131 Link Here
125
	cd ${S}/src/sandbox-1.1
143
	cd ${S}/src/sandbox-1.1
126
	make clean
144
	make clean
127
	make DESTDIR=${D} \
145
	make DESTDIR=${D} \
128
		HAVE_64BIT_ARCH="`use amd64 && use multilib`" \
146
		HAVE_64BIT_ARCH="${MULTILIB}" \
129
		install || die "Failed to compile sandbox"
147
		install || die "Failed to compile sandbox"
130
148
131
	#symlinks
149
	#symlinks

Return to bug 32963