Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 506956
Collapse All | Expand All

(-)file_not_specified_in_diff (-4 / +4 lines)
Line  Link Here
0
-- eclass/waf-utils.eclass
0
++ eclass/waf-utils.eclass
Lines 56-73 Link Here
56
	[[ -z ${NO_WAF_LIBDIR} ]] && libdir="--libdir=${EPREFIX}/usr/$(get_libdir)"
56
	[[ -z ${NO_WAF_LIBDIR} ]] && libdir="--libdir=${EPREFIX}/usr/$(get_libdir)"
57
57
58
	tc-export AR CC CPP CXX RANLIB
58
	tc-export AR CC CPP CXX RANLIB
59
	echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir} $@ configure"
59
	echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${CFLAGS} ${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir} $@ configure"
60
60
61
	# This condition is required because waf takes even whitespace as function
61
	# This condition is required because waf takes even whitespace as function
62
	# calls, awesome isn't it?
62
	# calls, awesome isn't it?
63
	if [[ -z ${NO_WAF_LIBDIR} ]]; then
63
	if [[ -z ${NO_WAF_LIBDIR} ]]; then
64
		CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
64
		CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \
65
			"--prefix=${EPREFIX}/usr" \
65
			"--prefix=${EPREFIX}/usr" \
66
			"${libdir}" \
66
			"${libdir}" \
67
			"$@" \
67
			"$@" \
68
			configure || die "configure failed"
68
			configure || die "configure failed"
69
	else
69
	else
70
		CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
70
		CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \
71
			"--prefix=${EPREFIX}/usr" \
71
			"--prefix=${EPREFIX}/usr" \
72
			"$@" \
72
			"$@" \
73
			configure || die "configure failed"
73
			configure || die "configure failed"

Return to bug 506956