diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-12-07 17:01:46 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-12-07 17:01:46 +0000 |
commit | 26adc0f6298fc96a3a8b0123b4924ef87d3f93d8 (patch) | |
tree | 58d782cb5a5e646c4db26527a8ad66d6493d4c35 /dev-tcltk | |
parent | Version Bump, cleaned old (diff) | |
download | gentoo-2-26adc0f6298fc96a3a8b0123b4924ef87d3f93d8.tar.gz gentoo-2-26adc0f6298fc96a3a8b0123b4924ef87d3f93d8.tar.bz2 gentoo-2-26adc0f6298fc96a3a8b0123b4924ef87d3f93d8.zip |
Multilib fix
(Portage version: 2.2.0_alpha7/cvs/Linux x86_64)
Diffstat (limited to 'dev-tcltk')
-rw-r--r-- | dev-tcltk/tcldom/ChangeLog | 5 | ||||
-rw-r--r-- | dev-tcltk/tcldom/tcldom-3.1.ebuild | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/dev-tcltk/tcldom/ChangeLog b/dev-tcltk/tcldom/ChangeLog index 3bae14acd1c5..d4dc5015d919 100644 --- a/dev-tcltk/tcldom/ChangeLog +++ b/dev-tcltk/tcldom/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-tcltk/tcldom # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcldom/ChangeLog,v 1.14 2010/12/07 12:51:11 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcldom/ChangeLog,v 1.15 2010/12/07 17:01:46 jlec Exp $ + + 07 Dec 2010; Justin Lecher <jlec@gentoo.org> tcldom-3.1.ebuild: + Multilib fix 07 Dec 2010; Justin Lecher <jlec@gentoo.org> +files/3.1-ldflags.patch, -tcldom-3.0.ebuild: diff --git a/dev-tcltk/tcldom/tcldom-3.1.ebuild b/dev-tcltk/tcldom/tcldom-3.1.ebuild index 9d34684a673a..2473104bfb4a 100644 --- a/dev-tcltk/tcldom/tcldom-3.1.ebuild +++ b/dev-tcltk/tcldom/tcldom-3.1.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/dev-tcltk/tcldom/tcldom-3.1.ebuild,v 1.4 2010/12/07 12:49:41 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcldom/tcldom-3.1.ebuild,v 1.5 2010/12/07 17:01:46 jlec Exp $ inherit eutils multilib toolchain-funcs @@ -40,6 +40,8 @@ src_compile() { tc-export CC + export LDFLAGS_OPTIMIZE="${LDFLAGS}" + use threads && myconf="${myconf} --enable-threads" if use xml ; then @@ -49,8 +51,8 @@ src_compile() { fi if use expat ; then cd "${S}/src" - LDFLAGS="${LDFLAGS}" econf ${myconf} - emake LDFLAGS_OPTIMIZE="${LDFLAGS}" || die + econf ${myconf} --with-libxml2-lib=/usr/$(get_libdir) + emake || die fi } @@ -60,11 +62,11 @@ src_install() { if use xml ; then cd "${S}/src-libxml2" - make DESTDIR="${D}" install || die + emake DESTDIR="${D}" install || die fi if use expat ; then cd "${S}/src" - make DESTDIR="${D}" install || die + emake DESTDIR="${D}" install || die fi cd "${S}" |