diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-05-03 02:22:39 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-03 02:22:39 +0000 |
| commit | 6a0bd7d79e2e995ff1dfe238ed39c300e3cf47c9 (patch) | |
| tree | cf064c2fa5faa987797e00560431c38c0dbf0c3b /dev-embedded | |
| parent | dev-util/pkgconfig -> virtual/pkgconfig (diff) | |
| download | gentoo-2-6a0bd7d79e2e995ff1dfe238ed39c300e3cf47c9.tar.gz gentoo-2-6a0bd7d79e2e995ff1dfe238ed39c300e3cf47c9.tar.bz2 gentoo-2-6a0bd7d79e2e995ff1dfe238ed39c300e3cf47c9.zip | |
Make sure the docdir is unique across cross-compilers #414075 by Soeren Hoeckner.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'dev-embedded')
| -rw-r--r-- | dev-embedded/avr-libc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-embedded/avr-libc/avr-libc-1.8.0.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/dev-embedded/avr-libc/ChangeLog b/dev-embedded/avr-libc/ChangeLog index 47f2f8d77b57..17a5bf5ad07c 100644 --- a/dev-embedded/avr-libc/ChangeLog +++ b/dev-embedded/avr-libc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-embedded/avr-libc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/ChangeLog,v 1.52 2012/04/13 18:03:10 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/ChangeLog,v 1.53 2012/05/03 02:22:39 vapier Exp $ + + 03 May 2012; Mike Frysinger <vapier@gentoo.org> avr-libc-1.8.0.ebuild: + Make sure the docdir is unique across cross-compilers #414075 by Soeren + Hoeckner. 13 Apr 2012; Ulrich Müller <ulm@gentoo.org> avr-libc-1.7.0.ebuild, avr-libc-1.7.1.ebuild, avr-libc-1.8.0.ebuild: diff --git a/dev-embedded/avr-libc/avr-libc-1.8.0.ebuild b/dev-embedded/avr-libc/avr-libc-1.8.0.ebuild index 406af70e9a5a..e6e3f81132a1 100644 --- a/dev-embedded/avr-libc/avr-libc-1.8.0.ebuild +++ b/dev-embedded/avr-libc/avr-libc-1.8.0.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-embedded/avr-libc/avr-libc-1.8.0.ebuild,v 1.3 2012/04/13 18:03:10 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avr-libc/avr-libc-1.8.0.ebuild,v 1.4 2012/05/03 02:22:39 vapier Exp $ EAPI="4" @@ -66,7 +66,9 @@ src_install() { # as they would then overwrite libc man pages insinto /usr/share/doc/${PF}/man/man3 doins "${WORKDIR}"/man/man3/* - prepman /usr/share/doc/${PF} use doc && dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/* + + # Make sure diff cross-compilers don't collide #414075 + mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die } |