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/dev-libs/glib/glib-1.2.10-r5.ebuild.orig (-3 / +47 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/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.39 2005/02/02 21:46:24 j4rg0n Exp $
3
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.39 2005/02/02 21:46:24 j4rg0n Exp $
4
4
5
inherit libtool flag-o-matic eutils gnuconfig
5
inherit libtool flag-o-matic eutils gnuconfig multilib
6
6
7
DESCRIPTION="The GLib library of C routines"
7
DESCRIPTION="The GLib library of C routines"
8
HOMEPAGE="http://www.gtk.org/"
8
HOMEPAGE="http://www.gtk.org/"
Lines 14-20 Link Here
14
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86"
14
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86"
15
IUSE=""
15
IUSE=""
16
16
17
DEPEND="virtual/libc"
17
DEPEND="virtual/libc
18
		!app-emulation/emul-linux-x86-baselibs"
18
19
19
src_unpack() {
20
src_unpack() {
20
	unpack ${A}
21
	unpack ${A}
Lines 30-38 Link Here
30
		darwintoolize
31
		darwintoolize
31
		gnuconfig_update
32
		gnuconfig_update
32
	fi
33
	fi
34
35
	if use amd64 && has_multilib_profile; then
36
		cp -ar ${S} ${S}-x86
37
		mv ${S} ${S}-amd64
38
	fi
33
}
39
}
34
40
35
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 --libdir=/usr/lib32
48
		ABI="amd64"
49
		cd ${S}-amd64
50
		src_compile-multilib --libdir=/usr/lib64
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() {
36
	# Bug 48839: pam fails to build on ia64
61
	# Bug 48839: pam fails to build on ia64
37
	# The problem is that it attempts to link a shared object against
62
	# The problem is that it attempts to link a shared object against
38
	# libglib.a; this library needs to be built with -fPIC.  Since
63
	# libglib.a; this library needs to be built with -fPIC.  Since
Lines 40-46 Link Here
40
	# whole thing with -fPIC (23 Apr 2004 agriffis)
65
	# whole thing with -fPIC (23 Apr 2004 agriffis)
41
	append-flags -fPIC
66
	append-flags -fPIC
42
67
43
	econf \
68
	econf ${1} \
44
		--with-threads=posix \
69
		--with-threads=posix \
45
		--enable-debug=yes \
70
		--enable-debug=yes \
46
		|| die
71
		|| die
Lines 48-53 Link Here
48
}
73
}
49
74
50
src_install() {
75
src_install() {
76
	if use amd64 && has_multilib_profile; then
77
		local OABI=${ABI}
78
		local OPWD=$PWD
79
		ABI="x86"
80
		cd ${S}-x86
81
		src_install-multilib
82
		ABI="amd64"
83
		cd ${S}-amd64
84
		src_install-multilib
85
		ABI=${OABI}
86
		cd ${OPWD}
87
		unset OABI
88
		unset OPWD
89
	else
90
		src_install-multilib
91
	fi
92
}
93
94
src_install-multilib() {
51
	make install DESTDIR="${D}" || die
95
	make install DESTDIR="${D}" || die
52
96
53
	dodoc AUTHORS ChangeLog README* INSTALL NEWS
97
	dodoc AUTHORS ChangeLog README* INSTALL NEWS

Return to bug 83811