diff options
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/waf-utils.eclass | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index e5f4f57cfc03..fad912639bbe 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1209 2014/04/16 10:09:29 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1210 2014/04/16 11:33:17 hasufell Exp $ + + 16 Apr 2014; Julian Ospald <hasufell@gentoo.org> waf-utils.eclass: + respect CFLAGS in linking command wrt #506956 16 Apr 2014; Alexey Shvetsov <alexxy@gentoo.org> openib.eclass: Update openib eclass diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass index 0d558d80c874..2013f4d775ca 100644 --- a/eclass/waf-utils.eclass +++ b/eclass/waf-utils.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.18 2013/11/23 04:35:16 jcallen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.19 2014/04/16 11:33:18 hasufell Exp $ # @ECLASS: waf-utils.eclass # @MAINTAINER: @@ -56,18 +56,18 @@ waf-utils_src_configure() { [[ -z ${NO_WAF_LIBDIR} ]] && libdir="--libdir=${EPREFIX}/usr/$(get_libdir)" tc-export AR CC CPP CXX RANLIB - echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir} $@ configure" + echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${CFLAGS} ${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir} $@ configure" # This condition is required because waf takes even whitespace as function # calls, awesome isn't it? if [[ -z ${NO_WAF_LIBDIR} ]]; then - CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ + CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \ "--prefix=${EPREFIX}/usr" \ "${libdir}" \ "$@" \ configure || die "configure failed" else - CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ + CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \ "--prefix=${EPREFIX}/usr" \ "$@" \ configure || die "configure failed" |