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

Collapse All | Expand All

(-)/usr/portage/app-arch/bzip2/bzip2-1.0.2-r5.ebuild.orig (-3 / +50 lines)
Lines 2-8 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.2-r5.ebuild,v 1.1 2005/02/19 18:30:39 vapier Exp $
3
# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.2-r5.ebuild,v 1.1 2005/02/19 18:30:39 vapier Exp $
4
4
5
inherit toolchain-funcs flag-o-matic
5
inherit toolchain-funcs flag-o-matic multilib
6
6
7
DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
7
DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
8
HOMEPAGE="http://sources.redhat.com/bzip2/"
8
HOMEPAGE="http://sources.redhat.com/bzip2/"
Lines 13-19 Link Here
13
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
13
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
14
IUSE="build static"
14
IUSE="build static"
15
15
16
DEPEND="virtual/libc"
16
DEPEND="virtual/libc
17
		!app-emulation/emul-linux-x86-baselibs"
17
18
18
src_unpack() {
19
src_unpack() {
19
	unpack ${A}
20
	unpack ${A}
Lines 31-39 Link Here
31
	if [[ -x /bin/bzip2 ]] && tc-is-cross-compiler ; then
32
	if [[ -x /bin/bzip2 ]] && tc-is-cross-compiler ; then
32
		sed -i -e 's:./bzip2 -:bzip2 -:g' Makefile || die
33
		sed -i -e 's:./bzip2 -:bzip2 -:g' Makefile || die
33
	fi
34
	fi
35
	if use amd64 && has_multilib_profile; then
36
		cp -ar ${S} ${S}-x86
37
		mv ${S} ${S}-amd64
38
	fi
34
}
39
}
35
40
36
src_compile() {
41
src_compile() {
42
	if use amd64 && has_multilib_profile; then
43
		local OABI=${ABI}
44
		local OPWD=$PWD
45
		ABI="x86"
46
		cd ${S}-x86
47
		src_compile-multilib
48
		ABI="amd64"
49
		cd ${S}-amd64
50
		src_compile-multilib
51
		ABI=${OABI}
52
		cd ${OPWD}
53
		unset OABI
54
		unset OPWD
55
	else
56
		src_compile-multilib
57
	fi
58
}
59
60
src_compile-multilib() {
37
	local makeopts="
61
	local makeopts="
38
		CC=$(tc-getCC)
62
		CC=$(tc-getCC)
39
		AR=$(tc-getAR)
63
		AR=$(tc-getAR)
Lines 46-51 Link Here
46
}
70
}
47
71
48
src_install() {
72
src_install() {
73
	if use amd64 && has_multilib_profile; then
74
		local OABI=${ABI}
75
		local OPWD=$PWD
76
		ABI="x86"
77
		cd ${S}-x86
78
		CONF_LIBDIR=lib32
79
		src_install-multilib ${S}-x86
80
		# remove x86 binaries
81
		rm -rf ${D}/bin
82
		ABI="amd64"
83
		cd ${S}-amd64
84
		CONF_LIBDIR=lib64
85
		src_install-multilib ${S}-amd64
86
		ABI=${OABI}
87
		cd ${OPWD}
88
		unset OABI
89
		unset OPWD
90
	else
91
		src_install-multilib ${S}
92
	fi
93
}
94
95
src_install-multilib() {
49
	if ! use build ; then
96
	if ! use build ; then
50
		make PREFIX="${D}"/usr install || die
97
		make PREFIX="${D}"/usr install || die
51
		mv "${D}"/usr/bin "${D}"
98
		mv "${D}"/usr/bin "${D}"
Lines 60-66 Link Here
60
107
61
		[[ -z ${CONF_LIBDIR} ]] && CONF_LIBDIR="lib"
108
		[[ -z ${CONF_LIBDIR} ]] && CONF_LIBDIR="lib"
62
		[[ ${CONF_LIBDIR} != "lib" ]] && mv ${D}/usr/lib ${D}/usr/${CONF_LIBDIR}
109
		[[ ${CONF_LIBDIR} != "lib" ]] && mv ${D}/usr/lib ${D}/usr/${CONF_LIBDIR}
63
		dolib.so "${S}"/libbz2.so.${PV}
110
		dolib.so "${1}"/libbz2.so.${PV}
64
		dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1.0
111
		dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1.0
65
		dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so
112
		dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so
66
		dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1
113
		dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1

Return to bug 83811