/[gentoo-x86]/eclass/waf-utils.eclass
Gentoo

Diff of /eclass/waf-utils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.18 Revision 1.19
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2014 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.18 2013/11/23 04:35:16 jcallen Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.19 2014/04/16 11:33:18 hasufell Exp $
4 4
5# @ECLASS: waf-utils.eclass 5# @ECLASS: waf-utils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# gnome@gentoo.org 7# gnome@gentoo.org
8# @AUTHOR: 8# @AUTHOR:
54 # Variable specifying that you don't want to set the libdir for waf script. 54 # Variable specifying that you don't want to set the libdir for waf script.
55 # Some scripts does not allow setting it at all and die if they find it. 55 # Some scripts does not allow setting it at all and die if they find it.
56 [[ -z ${NO_WAF_LIBDIR} ]] && libdir="--libdir=${EPREFIX}/usr/$(get_libdir)" 56 [[ -z ${NO_WAF_LIBDIR} ]] && libdir="--libdir=${EPREFIX}/usr/$(get_libdir)"
57 57
58 tc-export AR CC CPP CXX RANLIB 58 tc-export AR CC CPP CXX RANLIB
59 echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir} $@ configure" 59 echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${CFLAGS} ${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir} $@ configure"
60 60
61 # This condition is required because waf takes even whitespace as function 61 # This condition is required because waf takes even whitespace as function
62 # calls, awesome isn't it? 62 # calls, awesome isn't it?
63 if [[ -z ${NO_WAF_LIBDIR} ]]; then 63 if [[ -z ${NO_WAF_LIBDIR} ]]; then
64 CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ 64 CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \
65 "--prefix=${EPREFIX}/usr" \ 65 "--prefix=${EPREFIX}/usr" \
66 "${libdir}" \ 66 "${libdir}" \
67 "$@" \ 67 "$@" \
68 configure || die "configure failed" 68 configure || die "configure failed"
69 else 69 else
70 CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ 70 CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \
71 "--prefix=${EPREFIX}/usr" \ 71 "--prefix=${EPREFIX}/usr" \
72 "$@" \ 72 "$@" \
73 configure || die "configure failed" 73 configure || die "configure failed"
74 fi 74 fi
75} 75}

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.19

  ViewVC Help
Powered by ViewVC 1.1.20