diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-02-28 10:35:34 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-02-28 10:35:34 +0000 |
| commit | 5afbae7101cefc86f94ed2888856221a6fd25b21 (patch) | |
| tree | 1c337c3b01ecda3fc478d78b775b6e4ce5d5cbe7 /dev-libs/expat | |
| parent | Update the cups info. (diff) | |
| download | gentoo-2-5afbae7101cefc86f94ed2888856221a6fd25b21.tar.gz gentoo-2-5afbae7101cefc86f94ed2888856221a6fd25b21.tar.bz2 gentoo-2-5afbae7101cefc86f94ed2888856221a6fd25b21.zip | |
Ensure system CFLAGS get respected also in the libexpatw build wrt #406059
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/expat')
| -rw-r--r-- | dev-libs/expat/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/expat/expat-2.0.1-r6.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog index bfd0e124e72b..bd3c9bd2d1e5 100644 --- a/dev-libs/expat/ChangeLog +++ b/dev-libs/expat/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/expat # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.111 2012/02/27 15:17:31 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.112 2012/02/28 10:35:34 ssuominen Exp $ + + 28 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> expat-2.0.1-r6.ebuild: + Ensure system CFLAGS get respected also in the libexpatw build wrt #406059 27 Feb 2012; Agostino Sarubbo <ago@gentoo.org> expat-2.0.1-r6.ebuild: Stable for amd64, wrt bug #405915 diff --git a/dev-libs/expat/expat-2.0.1-r6.ebuild b/dev-libs/expat/expat-2.0.1-r6.ebuild index f1c013273c41..2a5583f4ba3e 100644 --- a/dev-libs/expat/expat-2.0.1-r6.ebuild +++ b/dev-libs/expat/expat-2.0.1-r6.ebuild @@ -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/dev-libs/expat/expat-2.0.1-r6.ebuild,v 1.3 2012/02/27 15:17:31 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.0.1-r6.ebuild,v 1.4 2012/02/28 10:35:34 ssuominen Exp $ EAPI=4 inherit eutils libtool toolchain-funcs @@ -35,11 +35,11 @@ src_configure() { if use unicode; then pushd "${S}"-buildu >/dev/null - CPPFLAGS+=" -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf} + CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf} popd >/dev/null pushd "${S}"-buildw >/dev/null - CFLAGS+=" -fshort-wchar" CPPFLAGS+=" -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf} + CFLAGS="${CFLAGS} -fshort-wchar" CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf} popd >/dev/null fi } |