diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2013-07-18 23:45:54 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2013-07-18 23:45:54 +0000 |
| commit | ff48e798217bebdb4c1258c8a0d57f1ad30351a8 (patch) | |
| tree | 12834d113bf8b00db46555af1fbac36f385fb858 /eclass | |
| parent | Die less ( dodoc => DOCS ). (diff) | |
| download | gentoo-2-ff48e798217bebdb4c1258c8a0d57f1ad30351a8.tar.gz gentoo-2-ff48e798217bebdb4c1258c8a0d57f1ad30351a8.tar.bz2 gentoo-2-ff48e798217bebdb4c1258c8a0d57f1ad30351a8.zip | |
libffi installation was fixed in 4.8.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index ddc2ed1d4cf9..59337666cd9f 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.882 2013/07/18 07:03:33 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.883 2013/07/18 23:45:54 dirtyepic Exp $ + + 18 Jul 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: + libffi installation was fixed in 4.8. 18 Jul 2013; Justin Lecher <jlec@gentoo.org> fortran-2.eclass: Wrap lines at 80 char diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index a76daadc7fc3..4e62822c7708 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.595 2013/07/18 22:33:48 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.596 2013/07/18 23:45:54 dirtyepic Exp $ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -786,7 +786,7 @@ toolchain_src_unpack() { fi # Prevent libffi from being installed - if tc_version_is_at_least 3.0 ; then + if tc_version_is_at_least 3.0 && ! tc_version_is_at_least 4.8 ; then sed -i -e 's/\(install.*:\) install-.*recursive/\1/' "${S}"/libffi/Makefile.in || die sed -i -e 's/\(install-data-am:\).*/\1/' "${S}"/libffi/include/Makefile.in || die fi |