summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-08-12 04:57:53 +0000
committerMike Frysinger <vapier@gentoo.org>2012-08-12 04:57:53 +0000
commitada8d6b00adb02934cbc14f5c5388327b2dd5186 (patch)
tree78041704299fa504d5f8005e33d6a49b05322885 /dev-util
parentAdd fix for building with gcc-4.6 #419627 by Maciej Szmigiero. (diff)
downloadgentoo-2-ada8d6b00adb02934cbc14f5c5388327b2dd5186.tar.gz
gentoo-2-ada8d6b00adb02934cbc14f5c5388327b2dd5186.tar.bz2
gentoo-2-ada8d6b00adb02934cbc14f5c5388327b2dd5186.zip
Make sure we install docs into unique cross-compiler dir to avoid collisions.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/mingw-runtime/ChangeLog5
-rw-r--r--dev-util/mingw-runtime/mingw-runtime-3.20.ebuild3
2 files changed, 6 insertions, 2 deletions
diff --git a/dev-util/mingw-runtime/ChangeLog b/dev-util/mingw-runtime/ChangeLog
index a329ebb1057d..d4a531a7cb84 100644
--- a/dev-util/mingw-runtime/ChangeLog
+++ b/dev-util/mingw-runtime/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/mingw-runtime
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/ChangeLog,v 1.25 2012/08/12 04:50:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/ChangeLog,v 1.26 2012/08/12 04:57:53 vapier Exp $
+
+ 12 Aug 2012; Mike Frysinger <vapier@gentoo.org> mingw-runtime-3.20.ebuild:
+ Make sure we install docs into unique cross-compiler dir to avoid collisions.
12 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+files/mingw-runtime-3.18-gcc-4.6.patch, mingw-runtime-3.18.ebuild:
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
index bffc787abac8..960fefef7bd2 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.20.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-util/mingw-runtime/mingw-runtime-3.20.ebuild,v 1.3 2012/08/12 04:49:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild,v 1.4 2012/08/12 04:57:53 vapier Exp $
EAPI="4"
@@ -70,6 +70,7 @@ src_install() {
emake install DESTDIR="${insdir}" || die
env -uRESTRICT CHOST=${CTARGET} prepallstrip
rm -rf "${insdir}"/usr/doc
+ docinto ${CTARGET} # Avoid collisions with other cross-compilers.
dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
fi
is_crosscompile && dosym usr /usr/${CTARGET}/mingw