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-fs/e2fsprogs/e2fsprogs-1.35-r1.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/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.17 2005/02/06 22:48:20 vapier Exp $
3
# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.17 2005/02/06 22:48:20 vapier Exp $
4
4
5
inherit eutils flag-o-matic gnuconfig toolchain-funcs
5
inherit eutils flag-o-matic gnuconfig toolchain-funcs multilib
6
6
7
DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
7
DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
8
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
8
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
Lines 17-23 Link Here
17
	diet? ( dev-libs/dietlibc )"
17
	diet? ( dev-libs/dietlibc )"
18
DEPEND="${RDEPEND}
18
DEPEND="${RDEPEND}
19
	nls? ( sys-devel/gettext )
19
	nls? ( sys-devel/gettext )
20
	sys-apps/texinfo"
20
	sys-apps/texinfo
21
	!app-emulation/emul-linux-x86-baselibs"
21
22
22
src_unpack() {
23
src_unpack() {
23
	unpack ${A}
24
	unpack ${A}
Lines 41-49 Link Here
41
		configure e2fsck/journal.c e2fsck/recovery.c \
42
		configure e2fsck/journal.c e2fsck/recovery.c \
42
		e2fsck/unix.c lib/ext2fs/kernel-jbd.h \
43
		e2fsck/unix.c lib/ext2fs/kernel-jbd.h \
43
		|| die "sed jbd debug failed"
44
		|| die "sed jbd debug failed"
45
46
	if use amd64 && has_multilib_profile; then
47
		cp -ar ${S} ${S}-x86
48
		mv ${S} ${S}-amd64
49
	fi
44
}
50
}
45
51
46
src_compile() {
52
src_compile() {
53
	if use amd64 && has_multilib_profile; then
54
		local OABI=${ABI}
55
		local OPWD=$PWD
56
		ABI="x86"
57
		cd ${S}-x86
58
		src_compile-multilib --libdir=/usr/lib32
59
		ABI="amd64"
60
		cd ${S}-amd64
61
		src_compile-multilib --libdir=/usr/lib64
62
		ABI=${OABI}
63
		cd ${OPWD}
64
		unset OABI
65
		unset OPWD
66
	else
67
		src_compile-multilib
68
	fi
69
}
70
71
src_compile-multilib() {
47
	# building e2fsprogs on sparc results in silo breaking
72
	# building e2fsprogs on sparc results in silo breaking
48
	[ "${ARCH}" = "sparc" ] && filter-flags -fstack-protector
73
	[ "${ARCH}" = "sparc" ] && filter-flags -fstack-protector
49
74
Lines 56-62 Link Here
56
		&& myconf="${myconf} --with-ldopts=-static" \
81
		&& myconf="${myconf} --with-ldopts=-static" \
57
		|| myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs"
82
		|| myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs"
58
	use diet && myconf="${myconf} --with-diet-libc"
83
	use diet && myconf="${myconf} --with-diet-libc"
59
	econf \
84
	econf ${1} \
60
		$(use_enable nls) \
85
		$(use_enable nls) \
61
		${myconf} || die
86
		${myconf} || die
62
87
Lines 65-70 Link Here
65
}
90
}
66
91
67
src_install() {
92
src_install() {
93
	if use amd64 && has_multilib_profile; then
94
		local OABI=${ABI}
95
		local OPWD=$PWD
96
		ABI="x86"
97
		cd ${S}-x86
98
		src_install-multilib
99
		ABI="amd64"
100
		cd ${S}-amd64
101
		src_install-multilib
102
		ABI=${OABI}
103
		cd ${OPWD}
104
		unset OABI
105
		unset OPWD
106
	else
107
		src_install-multilib
108
	fi
109
}
110
111
src_install-multilib() {
68
	make DESTDIR=${D} libdir=/zapme install || die
112
	make DESTDIR=${D} libdir=/zapme install || die
69
	#evil e2fsprogs makefile -- I'll get you!
113
	#evil e2fsprogs makefile -- I'll get you!
70
	rm -rf ${D}/zapme
114
	rm -rf ${D}/zapme

Return to bug 83811