* [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass
@ 2010-12-07 6:48 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; 8+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2010-12-07 6:48 UTC (permalink / raw
To: gentoo-commits
eva 10/12/07 06:48:08
Added: waf-utils.eclass
Log:
Initial commit of waf-utils eclass
Revision Changes Path
1.1 eclass/waf-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.1&content-type=text/plain
Index: waf-utils.eclass
===================================================================
# 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.1 2010/12/07 06:48:08 eva Exp $
# @ECLASS: waf-utils.eclass
# @MAINTAINER:
# gnome@gentoo.org
#
# @CODE
# Original Author: Gilles Dartiguelongue <eva@gentoo.org>
# @CODE
# @BLURB: common ebuild functions for waf-based packages
# @DESCRIPTION:
# The waf-utils eclass contains functions that make creating ebuild for
# waf-based packages much easier.
# Its main features are support of common portage default settings.
inherit base eutils multilib python
case ${EAPI:-0} in
3|2) EXPORT_FUNCTIONS pkg_setup src_configure src_compile src_install ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
# @ECLASS-VARIABLE: DOCS
# @DESCRIPTION:
# Documents passed to dodoc command.
# @FUNCTION: waf-utils_src_configure
# @DESCRIPTION:
# General function for configuring with waf.
waf-utils_pkg_setup() {
python_set_active_version 2
}
# @FUNCTION: waf-utils_src_configure
# @DESCRIPTION:
# General function for configuring with waf.
waf-utils_src_configure() {
debug-print-function ${FUNCNAME} "$@"
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${S}"/waf \
--prefix=/usr \
--libdir=/usr/$(get_libdir) \
$@ \
configure || die "configure failed"
}
# @FUNCTION: waf-utils_src_compile
# @DESCRIPTION:
# General function for compiling with waf.
waf-utils_src_compile() {
debug-print-function ${FUNCNAME} "$@"
local jobs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/--jobs=\2/" )
"${S}"/waf build ${jobs} || die "build failed"
}
# @FUNCTION: waf-utils_src_install
# @DESCRIPTION:
# Function for installing the package.
waf-utils_src_install() {
debug-print-function ${FUNCNAME} "$@"
has ${EAPI:-0} 2 && ! use prefix && ED="${D}"
"${S}"/waf --destdir="${ED}" install || die "Make install failed"
# Manual document installation
[[ -n "${DOCS}" ]] && { dodoc ${DOCS} || die "dodoc failed" ; }
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass
@ 2011-01-13 18:43 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-01-13 18:43 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/01/13 18:43:58
Modified: waf-utils.eclass
Log:
Merge in changes to be similar to cmake-utils.eclass so this eclass can be used for talloc.
Revision Changes Path
1.2 eclass/waf-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?r1=1.1&r2=1.2
Index: waf-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- waf-utils.eclass 7 Dec 2010 06:48:08 -0000 1.1
+++ waf-utils.eclass 13 Jan 2011 18:43:58 -0000 1.2
@@ -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.1 2010/12/07 06:48:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.2 2011/01/13 18:43:58 scarabeus Exp $
# @ECLASS: waf-utils.eclass
# @MAINTAINER:
@@ -8,6 +8,7 @@
#
# @CODE
# Original Author: Gilles Dartiguelongue <eva@gentoo.org>
+# Various improvements based on cmake-utils.eclass: Tomáš Chvátal <scarabeus@gentoo.org>
# @CODE
# @BLURB: common ebuild functions for waf-based packages
# @DESCRIPTION:
@@ -18,19 +19,22 @@
inherit base eutils multilib python
case ${EAPI:-0} in
- 3|2) EXPORT_FUNCTIONS pkg_setup src_configure src_compile src_install ;;
+ 4|3|2) EXPORT_FUNCTIONS pkg_setup src_configure src_compile src_install ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
-# @ECLASS-VARIABLE: DOCS
-# @DESCRIPTION:
-# Documents passed to dodoc command.
-
# @FUNCTION: waf-utils_src_configure
# @DESCRIPTION:
# General function for configuring with waf.
waf-utils_pkg_setup() {
+ debug-print-function ${FUNCNAME} "$@"
+
python_set_active_version 2
+
+ # @ECLASS-VARIABLE: WAF_BINARY
+ # @DESCRIPTION:
+ # Eclass can use different waf executable. Usually it is located in "${S}/waf".
+ : ${WAF_BINARY:="${S}/waf"}
}
# @FUNCTION: waf-utils_src_configure
@@ -39,7 +43,9 @@
waf-utils_src_configure() {
debug-print-function ${FUNCNAME} "$@"
- CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${S}"/waf \
+ echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=/usr --libdir=/usr/$(get_libdir) $@ configure"
+
+ CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
--prefix=/usr \
--libdir=/usr/$(get_libdir) \
$@ \
@@ -53,7 +59,8 @@
debug-print-function ${FUNCNAME} "$@"
local jobs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/--jobs=\2/" )
- "${S}"/waf build ${jobs} || die "build failed"
+ echo "\"${WAF_BINARY}\" build ${jobs}"
+ "${WAF_BINARY}" ${jobs} || die "build failed"
}
# @FUNCTION: waf-utils_src_install
@@ -61,11 +68,11 @@
# Function for installing the package.
waf-utils_src_install() {
debug-print-function ${FUNCNAME} "$@"
- has ${EAPI:-0} 2 && ! use prefix && ED="${D}"
- "${S}"/waf --destdir="${ED}" install || die "Make install failed"
+ has ${EAPI:-0} 2 && ! use prefix && ED="${D}"
+ echo "\"${WAF_BINARY}\" --destdir=\"${ED}\" install"
+ "${WAF_BINARY}" --destdir="${ED}" install || die "Make install failed"
# Manual document installation
- [[ -n "${DOCS}" ]] && { dodoc ${DOCS} || die "dodoc failed" ; }
+ base_src_install_docs
}
-
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass
@ 2011-01-16 8:36 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-01-16 8:36 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/01/16 08:36:35
Modified: waf-utils.eclass
Log:
Don't call python_set_active_version in eclass as it is not really required. Try to set waf binary once more in src_configure as some ebuild lack calls to pkg_setup over this eclass which results into empty WAF_BINARY.
Revision Changes Path
1.3 eclass/waf-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?r1=1.2&r2=1.3
Index: waf-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- waf-utils.eclass 13 Jan 2011 18:43:58 -0000 1.2
+++ waf-utils.eclass 16 Jan 2011 08:36:35 -0000 1.3
@@ -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.2 2011/01/13 18:43:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.3 2011/01/16 08:36:35 scarabeus Exp $
# @ECLASS: waf-utils.eclass
# @MAINTAINER:
@@ -16,7 +16,7 @@
# waf-based packages much easier.
# Its main features are support of common portage default settings.
-inherit base eutils multilib python
+inherit base eutils multilib
case ${EAPI:-0} in
4|3|2) EXPORT_FUNCTIONS pkg_setup src_configure src_compile src_install ;;
@@ -29,8 +29,6 @@
waf-utils_pkg_setup() {
debug-print-function ${FUNCNAME} "$@"
- python_set_active_version 2
-
# @ECLASS-VARIABLE: WAF_BINARY
# @DESCRIPTION:
# Eclass can use different waf executable. Usually it is located in "${S}/waf".
@@ -43,6 +41,10 @@
waf-utils_src_configure() {
debug-print-function ${FUNCNAME} "$@"
+ # sometimes people forget to run pkg_setup from this eclass
+ # instead of having the variable empty lets try to get it once more
+ : ${WAF_BINARY:="${S}/waf"}
+
echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=/usr --libdir=/usr/$(get_libdir) $@ configure"
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass
@ 2011-01-24 14:04 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-01-24 14:04 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/01/24 14:04:39
Modified: waf-utils.eclass
Log:
Drop pkg_setup phase since operations done inside of that phase were supposed to be done in the src_configure.
Revision Changes Path
1.4 eclass/waf-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?r1=1.3&r2=1.4
Index: waf-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- waf-utils.eclass 16 Jan 2011 08:36:35 -0000 1.3
+++ waf-utils.eclass 24 Jan 2011 14:04:39 -0000 1.4
@@ -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.3 2011/01/16 08:36:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.4 2011/01/24 14:04:39 scarabeus Exp $
# @ECLASS: waf-utils.eclass
# @MAINTAINER:
@@ -19,31 +19,20 @@
inherit base eutils multilib
case ${EAPI:-0} in
- 4|3|2) EXPORT_FUNCTIONS pkg_setup src_configure src_compile src_install ;;
+ 4|3) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
# @FUNCTION: waf-utils_src_configure
# @DESCRIPTION:
# General function for configuring with waf.
-waf-utils_pkg_setup() {
+waf-utils_src_configure() {
debug-print-function ${FUNCNAME} "$@"
# @ECLASS-VARIABLE: WAF_BINARY
# @DESCRIPTION:
# Eclass can use different waf executable. Usually it is located in "${S}/waf".
: ${WAF_BINARY:="${S}/waf"}
-}
-
-# @FUNCTION: waf-utils_src_configure
-# @DESCRIPTION:
-# General function for configuring with waf.
-waf-utils_src_configure() {
- debug-print-function ${FUNCNAME} "$@"
-
- # sometimes people forget to run pkg_setup from this eclass
- # instead of having the variable empty lets try to get it once more
- : ${WAF_BINARY:="${S}/waf"}
echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=/usr --libdir=/usr/$(get_libdir) $@ configure"
@@ -71,7 +60,6 @@
waf-utils_src_install() {
debug-print-function ${FUNCNAME} "$@"
- has ${EAPI:-0} 2 && ! use prefix && ED="${D}"
echo "\"${WAF_BINARY}\" --destdir=\"${ED}\" install"
"${WAF_BINARY}" --destdir="${ED}" install || die "Make install failed"
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass
@ 2011-03-01 23:02 Jonathan Callen (abcd)
0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Callen (abcd) @ 2011-03-01 23:02 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass
@ 2011-08-09 18:53 Jeroen Roovers (jer)
0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers (jer) @ 2011-08-09 18:53 UTC (permalink / raw
To: gentoo-commits
jer 11/08/09 18:53:06
Modified: waf-utils.eclass
Log:
Respect toolchain (bug #378529).
Revision Changes Path
1.6 eclass/waf-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?r1=1.5&r2=1.6
Index: waf-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- waf-utils.eclass 1 Mar 2011 23:02:08 -0000 1.5
+++ waf-utils.eclass 9 Aug 2011 18:53:06 -0000 1.6
@@ -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.5 2011/03/01 23:02:08 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.6 2011/08/09 18:53:06 jer Exp $
# @ECLASS: waf-utils.eclass
# @MAINTAINER:
@@ -17,7 +17,7 @@
# waf-based packages much easier.
# Its main features are support of common portage default settings.
-inherit base eutils multilib
+inherit base eutils multilib toolchain-funcs
case ${EAPI:-0} in
4|3) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
@@ -35,6 +35,7 @@
# Eclass can use different waf executable. Usually it is located in "${S}/waf".
: ${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"
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass
@ 2012-07-17 4:43 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2012-07-17 4:43 UTC (permalink / raw
To: gentoo-commits
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"
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass
@ 2012-07-20 1:37 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2012-07-20 1:37 UTC (permalink / raw
To: gentoo-commits
vapier 12/07/20 01:37:43
Modified: waf-utils.eclass
Log:
undo --libdir testing since it breaks with newer portage #427250 and the 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.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?r1=1.12&r2=1.13
Index: waf-utils.eclass
===================================================================
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/07/17 04:43:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.13 2012/07/20 01:37:43 vapier Exp $
# @ECLASS: waf-utils.eclass
# @MAINTAINER:
@@ -41,15 +41,11 @@
: ${WAF_BINARY:="${S}/waf"}
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=${EPREFIX}/usr/$(get_libdir)" "$@"
- fi
- echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr $@ configure"
+ echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr --libdir=${EPREFIX}/usr/$(get_libdir) $@ configure"
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
"--prefix=${EPREFIX}/usr" \
+ "--libdir=${EPREFIX}/usr/$(get_libdir)" \
"$@" \
configure || die "configure failed"
}
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-07-20 1:38 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-16 8:36 [gentoo-commits] gentoo-x86 commit in eclass: waf-utils.eclass Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2012-07-20 1:37 Mike Frysinger (vapier)
2012-07-17 4:43 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-13 18:43 Tomas Chvatal (scarabeus)
2010-12-07 6:48 Gilles Dartiguelongue (eva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox