diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2011-04-22 16:09:06 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-04-22 16:09:06 +0000 |
| commit | fd05401bb312163c378389dd5107e18a3c7ddd00 (patch) | |
| tree | 6019d0744072f7eb722288dda4ca5fdd1efede7d /app-emulation | |
| parent | Prepare for new ssmtp with optional mta support (bug #289973). exim-4.71 is u... (diff) | |
| download | gentoo-2-fd05401bb312163c378389dd5107e18a3c7ddd00.tar.gz gentoo-2-fd05401bb312163c378389dd5107e18a3c7ddd00.tar.bz2 gentoo-2-fd05401bb312163c378389dd5107e18a3c7ddd00.zip | |
Make the configure script accepting gcc-4.6.x (bug #362861)
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/virtualbox/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/virtualbox/files/virtualbox-4.0.4-gcc46.patch | 14 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-4.0.6.ebuild | 5 |
3 files changed, 24 insertions, 2 deletions
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog index a97ae11c4cb1..cced63a2725c 100644 --- a/app-emulation/virtualbox/ChangeLog +++ b/app-emulation/virtualbox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/virtualbox # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.66 2011/04/22 15:44:24 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.67 2011/04/22 16:09:06 polynomial-c Exp $ + + 22 Apr 2011; Lars Wendler <polynomial-c@gentoo.org> + +files/virtualbox-4.0.4-gcc46.patch, virtualbox-4.0.6.ebuild: + Make the configure script accepting gcc-4.6.x as well. Thanks to Alphat-PC + who reported this in bug #362861. *virtualbox-4.0.6 (22 Apr 2011) diff --git a/app-emulation/virtualbox/files/virtualbox-4.0.4-gcc46.patch b/app-emulation/virtualbox/files/virtualbox-4.0.4-gcc46.patch new file mode 100644 index 000000000000..a9f8077e69e5 --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-4.0.4-gcc46.patch @@ -0,0 +1,14 @@ +--- VirtualBox-4.0.4_OSE.orig/configure 2011-02-18 00:30:48.000000000 +0800 ++++ VirtualBox-4.0.4_OSE.orig/configure 2011-04-10 13:37:42.513743178 +0800 +@@ -409,9 +409,9 @@ check_gcc() + elif [ $cc_maj -lt 3 \ + -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \ + -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \ +- -o \( $cc_maj -eq 4 -a $cc_min -gt 5 \) \ ++ -o \( $cc_maj -eq 4 -a $cc_min -gt 6 \) \ + -o $cc_maj -gt 4 ]; then +- log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<5" ++ log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<=6" + fail really + else + log_success "found version $cc_ver" diff --git a/app-emulation/virtualbox/virtualbox-4.0.6.ebuild b/app-emulation/virtualbox/virtualbox-4.0.6.ebuild index 3e783d47c104..4e8218bf1567 100644 --- a/app-emulation/virtualbox/virtualbox-4.0.6.ebuild +++ b/app-emulation/virtualbox/virtualbox-4.0.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.0.6.ebuild,v 1.1 2011/04/22 15:44:24 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.0.6.ebuild,v 1.2 2011/04/22 16:09:06 polynomial-c Exp $ EAPI=4 @@ -160,6 +160,9 @@ src_prepare() { # We still want to use ${HOME}/.VirtualBox/Machines as machines dir. epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch" + # make configure accept gcc-4.6.x (bug #362861) + epatch "${FILESDIR}/${PN}-4.0.4-gcc46.patch" + # add correct java path if use java ; then sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \ |