From: "Mike Frysinger (vapier)" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass
Date: Tue, 17 Jul 2012 04:43:50 +0000 (UTC) [thread overview]
Message-ID: <20120717044350.67AD620063@flycatcher.gentoo.org> (raw)
vapier 12/07/17 04:43:50
Modified: waf-utils.eclass
Log:
detect if waf supports --libdir as some versions (like glmark2) do not #412133
Revision Changes Path
1.12 eclass/waf-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?r1=1.11&r2=1.12
Index: waf-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- waf-utils.eclass 7 Jun 2012 05:02:33 -0000 1.11
+++ waf-utils.eclass 17 Jul 2012 04:43:50 -0000 1.12
@@ -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.11 2012/06/07 05:02:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.12 2012/07/17 04:43:50 vapier Exp $
# @ECLASS: waf-utils.eclass
# @MAINTAINER:
@@ -41,11 +41,15 @@
: ${WAF_BINARY:="${S}/waf"}
tc-export AR CC CPP CXX RANLIB
- echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr --libdir=${EPREFIX}/usr/$(get_libdir) $@ configure"
+
+ # Make sure this waf supports --libdir #412133
+ if "${WAF_BINARY}" --help | grep -q -e--libdir ; then
+ set -- "--libdir=${EPREFIX}/usr/$(get_libdir)" "$@"
+ fi
+ echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr $@ configure"
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
"--prefix=${EPREFIX}/usr" \
- "--libdir=${EPREFIX}/usr/$(get_libdir)" \
"$@" \
configure || die "configure failed"
}
next reply other threads:[~2012-07-17 4:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-17 4:43 Mike Frysinger (vapier) [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-07-20 1:37 [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass Mike Frysinger (vapier)
2011-08-09 18:53 Jeroen Roovers (jer)
2011-03-01 23:02 Jonathan Callen (abcd)
2011-01-24 14:04 Tomas Chvatal (scarabeus)
2011-01-16 8:36 Tomas Chvatal (scarabeus)
2011-01-13 18:43 Tomas Chvatal (scarabeus)
2010-12-07 6:48 Gilles Dartiguelongue (eva)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120717044350.67AD620063@flycatcher.gentoo.org \
--to=vapier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox