From: "Jonathan Callen (abcd)" <abcd@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass
Date: Tue, 1 Mar 2011 23:02:08 +0000 (UTC) [thread overview]
Message-ID: <20110301230208.8C67120054@flycatcher.gentoo.org> (raw)
abcd 11/03/01 23:02:08
Modified: waf-utils.eclass
Log:
Fix prefix support
Revision Changes Path
1.5 eclass/waf-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?r1=1.4&r2=1.5
Index: waf-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- waf-utils.eclass 24 Jan 2011 14:04:39 -0000 1.4
+++ waf-utils.eclass 1 Mar 2011 23:02:08 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.4 2011/01/24 14:04:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.5 2011/03/01 23:02:08 abcd Exp $
# @ECLASS: waf-utils.eclass
# @MAINTAINER:
@@ -9,6 +9,7 @@
# @CODE
# Original Author: Gilles Dartiguelongue <eva@gentoo.org>
# Various improvements based on cmake-utils.eclass: Tomáš Chvátal <scarabeus@gentoo.org>
+# Proper prefix support: Jonathan Callen <abcd@gentoo.org>
# @CODE
# @BLURB: common ebuild functions for waf-based packages
# @DESCRIPTION:
@@ -34,12 +35,12 @@
# Eclass can use different waf executable. Usually it is located in "${S}/waf".
: ${WAF_BINARY:="${S}/waf"}
- echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=/usr --libdir=/usr/$(get_libdir) $@ configure"
+ echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr --libdir=${EPREFIX}/usr/$(get_libdir) $@ configure"
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
- --prefix=/usr \
- --libdir=/usr/$(get_libdir) \
- $@ \
+ "--prefix=${EPREFIX}/usr" \
+ "--libdir=${EPREFIX}/usr/$(get_libdir)" \
+ "$@" \
configure || die "configure failed"
}
@@ -60,8 +61,8 @@
waf-utils_src_install() {
debug-print-function ${FUNCNAME} "$@"
- echo "\"${WAF_BINARY}\" --destdir=\"${ED}\" install"
- "${WAF_BINARY}" --destdir="${ED}" install || die "Make install failed"
+ echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install"
+ "${WAF_BINARY}" --destdir="${D}" install || die "Make install failed"
# Manual document installation
base_src_install_docs
next reply other threads:[~2011-03-01 23:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 23:02 Jonathan Callen (abcd) [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)
2012-07-17 4:43 Mike Frysinger (vapier)
2011-08-09 18:53 Jeroen Roovers (jer)
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=20110301230208.8C67120054@flycatcher.gentoo.org \
--to=abcd@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