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/sys-libs/zlib/zlib-1.2.2.ebuild.orig (-1 / +46 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/sys-libs/zlib/zlib-1.2.2.ebuild,v 1.11 2005/02/17 16:42:40 lu_zero Exp $
3
# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.2.ebuild,v 1.11 2005/02/17 16:42:40 lu_zero Exp $
4
4
5
inherit eutils flag-o-matic
5
inherit eutils flag-o-matic multilib
6
6
7
DESCRIPTION="Standard (de)compression library"
7
DESCRIPTION="Standard (de)compression library"
8
HOMEPAGE="http://www.gzip.org/zlib/"
8
HOMEPAGE="http://www.gzip.org/zlib/"
Lines 16-21 Link Here
16
16
17
RDEPEND="virtual/libc"
17
RDEPEND="virtual/libc"
18
18
19
DEPEND="${RDEPEND}
20
		!app-emulation/emul-linux-x86-baselibs"
21
19
pkg_setup() {
22
pkg_setup() {
20
	tc-export CC RANLIB
23
	tc-export CC RANLIB
21
	export AR="$(tc-getAR) rc"
24
	export AR="$(tc-getAR) rc"
Lines 35-48 Link Here
35
	epatch ${FILESDIR}/${PN}-1.2.1-configure.patch
38
	epatch ${FILESDIR}/${PN}-1.2.1-configure.patch
36
	# fix shared library test on -fPIC dependant archs
39
	# fix shared library test on -fPIC dependant archs
37
	epatch ${FILESDIR}/${PN}-1.2.1-fPIC.patch
40
	epatch ${FILESDIR}/${PN}-1.2.1-fPIC.patch
41
	if use amd64 && has_multilib_profile; then
42
		cp -ar ${S} ${S}-x86
43
		mv ${S} ${S}-amd64
44
	fi
38
}
45
}
39
46
40
src_compile() {
47
src_compile() {
48
	if use amd64 && has_multilib_profile; then
49
		local OABI=${ABI}
50
		local OPWD=$PWD
51
		ABI="x86"
52
		cd ${S}-x86
53
		src_compile-multilib
54
		ABI="amd64"
55
		cd ${S}-amd64
56
		src_compile-multilib
57
		cd ${OPWD}
58
		ABI=${OABI}
59
		unset OABI
60
		unset OPWD
61
	else
62
		src_compile-multilib
63
	fi
64
}
65
66
src_compile-multilib() {
41
	./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die
67
	./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die
42
	emake || die
68
	emake || die
43
}
69
}
44
70
45
src_install() {
71
src_install() {
72
	if use amd64 && has_multilib_profile; then
73
		local OABI=${ABI}
74
		local OPWD=$PWD
75
		ABI="x86"
76
		cd ${S}-x86
77
		src_install-multilib
78
		ABI="amd64"
79
		cd ${S}-amd64
80
		src_install-multilib
81
		cd ${OPWD}
82
		ABI=${OABI}
83
		unset OABI
84
		unset OPWD
85
	else
86
		src_install-multilib
87
	fi
88
}
89
90
src_install-multilib() {
46
	einstall libdir=${D}/$(get_libdir) || die
91
	einstall libdir=${D}/$(get_libdir) || die
47
	rm "${D}"/$(get_libdir)/libz.a
92
	rm "${D}"/$(get_libdir)/libz.a
48
	insinto /usr/include
93
	insinto /usr/include

Return to bug 83811