diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2010-12-21 19:17:54 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2010-12-21 19:17:54 +0000 |
| commit | c1c296bed03d5512e6aa2020bb8352e7c02976e2 (patch) | |
| tree | 7a0bb68736cb50bfa570ad123bc2bb6f95ca9f7b /app-doc | |
| parent | x86 stable wrt bug #349223 (diff) | |
| download | gentoo-2-c1c296bed03d5512e6aa2020bb8352e7c02976e2.tar.gz gentoo-2-c1c296bed03d5512e6aa2020bb8352e7c02976e2.tar.bz2 gentoo-2-c1c296bed03d5512e6aa2020bb8352e7c02976e2.zip | |
Updated anti-flag mangling per bug 348629 (artifact of EAPI update).
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'app-doc')
| -rw-r--r-- | app-doc/doxygen/ChangeLog | 7 | ||||
| -rw-r--r-- | app-doc/doxygen/doxygen-1.7.2.ebuild | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog index d0a63cf0b51b..b607d50384bb 100644 --- a/app-doc/doxygen/ChangeLog +++ b/app-doc/doxygen/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-doc/doxygen # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.186 2010/12/20 13:27:16 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.187 2010/12/21 19:17:54 nerdboy Exp $ + + 21 Dec 2010; Steve Arnold <nerdboy@gentoo.org> doxygen-1.7.2.ebuild: + Updated anti-flag mangling per bug 348629 (artifact of EAPI update). But + even with some extra massaging (and brute force sedding) doxywizard is + being stubborn with all that tmake/qmake on-the-fly writing of things... 20 Dec 2010; Tobias Klausmann <klausman@gentoo.org> doxygen-1.7.2.ebuild: Stable on alpha, bug #338632 diff --git a/app-doc/doxygen/doxygen-1.7.2.ebuild b/app-doc/doxygen/doxygen-1.7.2.ebuild index c0c6fec4b931..52e89cf79c1e 100644 --- a/app-doc/doxygen/doxygen-1.7.2.ebuild +++ b/app-doc/doxygen/doxygen-1.7.2.ebuild @@ -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/app-doc/doxygen/doxygen-1.7.2.ebuild,v 1.3 2010/12/20 13:27:16 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.2.ebuild,v 1.4 2010/12/21 19:17:54 nerdboy Exp $ EAPI=3 @@ -33,6 +33,8 @@ EPATCH_SUFFIX="patch" src_prepare() { # use CFLAGS, CXXFLAGS, LDFLAGS + export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}" + sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \ -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \ -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \ @@ -75,7 +77,6 @@ src_prepare() { } src_configure() { - export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}" # set ./configure options (prefix, Qt based wizard, docdir) local my_conf="" @@ -93,6 +94,7 @@ src_configure() { export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir)${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'." einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'." + ./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \ || die 'configure with qt4 failed' else @@ -101,7 +103,8 @@ src_configure() { } src_compile() { - emake all || die 'emake failed' + CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \ + emake all || die 'emake failed' # generate html and pdf (if tetex in use) documents. # errors here are not considered fatal, hence the ewarn message |