From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1Ss2AN-0006qQ-Mt for garchives@archives.gentoo.org; Fri, 20 Jul 2012 01:38:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62C9EE0665; Fri, 20 Jul 2012 01:37:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3284DE0665 for ; Fri, 20 Jul 2012 01:37:56 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8DB6567A1D for ; Fri, 20 Jul 2012 01:37:55 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id DF41720063; Fri, 20 Jul 2012 01:37:43 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: waf-utils.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20120720013743.DF41720063@flycatcher.gentoo.org> Date: Fri, 20 Jul 2012 01:37:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ae80a5c3-5f66-4bb5-9b00-e18d8ba51685 X-Archives-Hash: 07b7c3d76a28f088997c813d32f6ebe0 vapier 12/07/20 01:37:43 Modified: waf-utils.eclass Log: undo --libdir testing since it breaks with newer portage #427250 and th= e package that needed this has been rewritten (glmark2) Revision Changes Path 1.13 eclass/waf-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.e= class?rev=3D1.13&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.e= class?rev=3D1.13&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.e= class?r1=3D1.12&r2=3D1.13 Index: waf-utils.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- waf-utils.eclass 17 Jul 2012 04:43:50 -0000 1.12 +++ waf-utils.eclass 20 Jul 2012 01:37:43 -0000 1.13 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.12 2012/0= 7/17 04:43:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.13 2012/0= 7/20 01:37:43 vapier Exp $ =20 # @ECLASS: waf-utils.eclass # @MAINTAINER: @@ -41,15 +41,11 @@ : ${WAF_BINARY:=3D"${S}/waf"} =20 tc-export AR CC CPP CXX RANLIB - - # Make sure this waf supports --libdir #412133 - if "${WAF_BINARY}" --help | grep -q -e--libdir ; then - set -- "--libdir=3D${EPREFIX}/usr/$(get_libdir)" "$@" - fi - echo "CCFLAGS=3D\"${CFLAGS}\" LINKFLAGS=3D\"${LDFLAGS}\" \"${WAF_BINARY= }\" --prefix=3D${EPREFIX}/usr $@ configure" + echo "CCFLAGS=3D\"${CFLAGS}\" LINKFLAGS=3D\"${LDFLAGS}\" \"${WAF_BINARY= }\" --prefix=3D${EPREFIX}/usr --libdir=3D${EPREFIX}/usr/$(get_libdir) $@ = configure" =20 CCFLAGS=3D"${CFLAGS}" LINKFLAGS=3D"${LDFLAGS}" "${WAF_BINARY}" \ "--prefix=3D${EPREFIX}/usr" \ + "--libdir=3D${EPREFIX}/usr/$(get_libdir)" \ "$@" \ configure || die "configure failed" }