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-devel/binutils/binutils-2.15.92.0.2-r1.ebuild.orig (-3 / +59 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-devel/binutils/binutils-2.15.92.0.2-r1.ebuild,v 1.27 2005/01/23 11:53:18 eradicator Exp $
3
# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild,v 1.27 2005/01/23 11:53:18 eradicator Exp $
4
4
5
inherit eutils libtool flag-o-matic gnuconfig
5
inherit eutils libtool flag-o-matic gnuconfig multilib
6
6
7
PATCHVER="1.2"
7
PATCHVER="1.2"
8
UCLIBC_PATCHVER="1.0"
8
UCLIBC_PATCHVER="1.0"
Lines 20-26 Link Here
20
20
21
DEPEND="virtual/libc
21
DEPEND="virtual/libc
22
	nls? ( sys-devel/gettext )
22
	nls? ( sys-devel/gettext )
23
	!build? ( !bootstrap? ( dev-lang/perl ) )"
23
	!build? ( !bootstrap? ( dev-lang/perl ) )
24
	!app-emulation/emul-linux-x86-baselibs"
24
25
25
src_unpack() {
26
src_unpack() {
26
	unpack ${A}
27
	unpack ${A}
Lines 47-55 Link Here
47
	done
48
	done
48
49
49
	gnuconfig_update
50
	gnuconfig_update
51
52
	if use amd64 && has_multilib_profile; then
53
		cp -ar ${S} ${S}-x86
54
		mv ${S} ${S}-amd64
55
	fi
50
}
56
}
51
57
52
src_compile() {
58
src_compile() {
59
	if use amd64 && has_multilib_profile; then
60
		local OABI=${ABI}
61
		local OPWD=$PWD
62
		local OS=${S}
63
		ABI="x86"
64
		S="${OS}-x86"
65
		cd ${S}
66
		src_compile-multilib --libdir=/usr/lib32
67
		ABI="amd64"
68
		S="${OS}-amd64"
69
		cd ${S}
70
		src_compile-multilib --libdir=/usr/lib64
71
		ABI=${OABI}
72
		cd ${OPWD}
73
		S=${OS}
74
		unset OABI
75
		unset OPWD
76
		unset OS
77
	else
78
		src_compile-multilib
79
	fi
80
}
81
82
src_compile-multilib() {
53
	strip-linguas -i */po #42033
83
	strip-linguas -i */po #42033
54
84
55
	# Generate borked binaries.  Bug #6730
85
	# Generate borked binaries.  Bug #6730
Lines 69-75 Link Here
69
	# Fix /usr/lib/libbfd.la
99
	# Fix /usr/lib/libbfd.la
70
	elibtoolize --portage --no-uclibc
100
	elibtoolize --portage --no-uclibc
71
101
72
	./configure \
102
	./configure ${1} \
73
		--enable-shared \
103
		--enable-shared \
74
		--enable-64-bit-bfd \
104
		--enable-64-bit-bfd \
75
		--prefix=/usr \
105
		--prefix=/usr \
Lines 100-105 Link Here
100
}
130
}
101
131
102
src_install() {
132
src_install() {
133
	if use amd64 && has_multilib_profile; then
134
		local OABI=${ABI}
135
		local OPWD=$PWD
136
		local OS=${S}
137
		ABI="x86"
138
		S="${OS}-x86"
139
		cd ${S}
140
		src_install-multilib
141
		# remove all but the lib32 subdirectory
142
		rm -rf ${D}/usr/{bin,include,share,${CHOST}}
143
		ABI="amd64"
144
		S="${OS}-amd64"
145
		cd ${S}
146
		src_install-multilib
147
		ABI=${OABI}
148
		cd ${OPWD}
149
		S=${OS}
150
		unset OS
151
		unset OABI
152
		unset OPWD
153
	else
154
		src_install-multilib
155
	fi
156
}
157
158
src_install-multilib() {
103
	make DESTDIR=${D} \
159
	make DESTDIR=${D} \
104
		install || die
160
		install || die
105
161

Return to bug 83811