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

Collapse All | Expand All

(-)/usr/portage/dev-libs/apr/apr-1.4.4.ebuild (-7 / +10 lines)
Lines 21-30 Link Here
21
	doc? ( app-doc/doxygen )"
21
	doc? ( app-doc/doxygen )"
22
22
23
src_prepare() {
23
src_prepare() {
24
	# Ensure that system libtool is used.
25
	sed -e 's:${installbuilddir}/libtool:/usr/bin/libtool:' -i apr-config.in || die "sed failed"
26
	sed -e 's:@LIBTOOL@:$(SHELL) /usr/bin/libtool:' -i build/apr_rules.mk.in || die "sed failed"
27
28
	AT_M4DIR="build" eautoreconf
24
	AT_M4DIR="build" eautoreconf
29
	elibtoolize
25
	elibtoolize
30
26
Lines 63-77 Link Here
63
}
59
}
64
60
65
src_compile() {
61
src_compile() {
66
	emake || die "emake failed"
62
	emake \
63
		LIBTOOL="${ROOT}usr/bin/libtool" \
64
		|| die "emake failed"
67
65
68
	if use doc; then
66
	if use doc; then
69
		emake dox || die "emake dox failed"
67
		emake \
68
			LIBTOOL="${ROOT}usr/bin/libtool" \
69
			dox || die "emake dox failed"
70
	fi
70
	fi
71
}
71
}
72
72
73
src_install() {
73
src_install() {
74
	emake DESTDIR="${D}" install || die "emake install failed"
74
	emake \
75
		DESTDIR="${D}" \
76
		LIBTOOL="${ROOT}usr/bin/libtool" \
77
		install || die "emake install failed"
75
78
76
	find "${ED}" -name "*.la" -print0 | xargs -0 rm -f
79
	find "${ED}" -name "*.la" -print0 | xargs -0 rm -f
77
80

Return to bug 374355