diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-06-04 15:40:03 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-06-04 15:40:03 +0000 |
| commit | fc68ba45074210241685126519c8348902bbac8d (patch) | |
| tree | 18e473c50058e2e56786607d87a98687fed3949b /dev-libs/libwbxml | |
| parent | Version bump, bug 224337 (diff) | |
| download | gentoo-2-fc68ba45074210241685126519c8348902bbac8d.tar.gz gentoo-2-fc68ba45074210241685126519c8348902bbac8d.tar.bz2 gentoo-2-fc68ba45074210241685126519c8348902bbac8d.zip | |
Fix up ebuild, _do not use bootstrap scripts unless absolutely necessary_. Use autotools eclass (eautoreconf), and do that in unpack phase. Also instead of hardcoding the CFLAGS during unpack phase in the Makefile, make it use AM_CFLAGS as it's supposed to. Fix quoting.
(Portage version: 2.1.5.3)
Diffstat (limited to 'dev-libs/libwbxml')
| -rw-r--r-- | dev-libs/libwbxml/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-libs/libwbxml/libwbxml-0.9.2.ebuild | 34 |
2 files changed, 20 insertions, 24 deletions
diff --git a/dev-libs/libwbxml/ChangeLog b/dev-libs/libwbxml/ChangeLog index 9998b8e1ffed..69d0f17f3b2a 100644 --- a/dev-libs/libwbxml/ChangeLog +++ b/dev-libs/libwbxml/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libwbxml -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/ChangeLog,v 1.8 2007/03/12 16:36:42 armin76 Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/ChangeLog,v 1.9 2008/06/04 15:40:03 flameeyes Exp $ + + 04 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> libwbxml-0.9.2.ebuild: + Fix up ebuild, _do not use bootstrap scripts unless absolutely necessary_. + Use autotools eclass (eautoreconf), and do that in unpack phase. Also + instead of hardcoding the CFLAGS during unpack phase in the Makefile, make + it use AM_CFLAGS as it's supposed to. Fix quoting. 12 Mar 2007; Raúl Porcel <armin76@gentoo.org> libwbxml-0.9.2.ebuild: x86 stable diff --git a/dev-libs/libwbxml/libwbxml-0.9.2.ebuild b/dev-libs/libwbxml/libwbxml-0.9.2.ebuild index a9c899e0a6fb..edd30168f431 100644 --- a/dev-libs/libwbxml/libwbxml-0.9.2.ebuild +++ b/dev-libs/libwbxml/libwbxml-0.9.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/libwbxml-0.9.2.ebuild,v 1.7 2007/06/26 01:53:49 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/libwbxml-0.9.2.ebuild,v 1.8 2008/06/04 15:40:03 flameeyes Exp $ -inherit eutils +inherit eutils autotools IUSE="" @@ -26,29 +26,19 @@ S="${WORKDIR}/${MY_P}" src_unpack() { unpack ${A} - - cd ${S} - - # Remove ./configure stuff from the bootstrap script, - # we will handle that step directly - subst="./configure --prefix=/usr" - sed -i -e "s:${subst}:#${subst}:" bootstrap + cd "${S}" # Remove doc stuff from Makefile.am, otherwise make install complains - epatch ${FILESDIR}/${MY_P}.make_install.patch - - # Add support for our own CFLAGS - sed -i -e "s: -g::" -e "s:-O3\\\:${CFLAGS}:" {src,tools}/Makefile.am + epatch "${FILESDIR}/${MY_P}.make_install.patch" - chmod 755 bootstrap -} - -src_compile() -{ - ./bootstrap + # Don't rewrite use CFLAGS, pass everything as AM_CFLAGS instead. + sed -i \ + -e '/-\(O3\|g\)/d' \ + -e '/-Wall/s:\\::' \ + -e 's:CFLAGS:AM_CFLAGS:' \ + {src,tools}/Makefile.am - econf || die "Configuration failed" - emake || die "Compilation failed" + eautoreconf } src_install() |