hasufell 14/04/16 11:33:18 Modified: ChangeLog waf-utils.eclass Log: respect CFLAGS in linking command wrt #506956
Revision Changes Path 1.1210 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1210&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1210&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1209&r2=1.1210 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1209 retrieving revision 1.1210 diff -u -r1.1209 -r1.1210 --- ChangeLog 16 Apr 2014 10:09:29 -0000 1.1209 +++ ChangeLog 16 Apr 2014 11:33:17 -0000 1.1210 @@ -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 <[email protected]> waf-utils.eclass: + respect CFLAGS in linking command wrt #506956 16 Apr 2014; Alexey Shvetsov <[email protected]> openib.eclass: Update openib eclass 1.19 eclass/waf-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.19&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.19&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?r1=1.18&r2=1.19 Index: waf-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- waf-utils.eclass 23 Nov 2013 04:35:16 -0000 1.18 +++ waf-utils.eclass 16 Apr 2014 11:33:18 -0000 1.19 @@ -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 @@ [[ -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"
