diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2011-11-25 10:25:23 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-11-25 10:25:23 +0000 |
| commit | 3ac17d54c9a04be148f8edafd751f9574768169a (patch) | |
| tree | 39b6d4ef686e64ed2d88a80d734e174b32d8a218 /app-emulation | |
| parent | Version bump, drop old, add prefix love (diff) | |
| download | gentoo-2-3ac17d54c9a04be148f8edafd751f9574768169a.tar.gz gentoo-2-3ac17d54c9a04be148f8edafd751f9574768169a.tar.bz2 gentoo-2-3ac17d54c9a04be148f8edafd751f9574768169a.zip | |
Fixed compilation with dev-lang/yasm-1.2.0 (bug #391189)
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/virtualbox/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/virtualbox/files/virtualbox-4.1.6-yasm120-fix.patch | 29 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild | 5 |
3 files changed, 38 insertions, 2 deletions
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog index ee3da58a69f1..bc2098cf5031 100644 --- a/app-emulation/virtualbox/ChangeLog +++ b/app-emulation/virtualbox/ChangeLog @@ -1,6 +1,10 @@ # 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.92 2011/11/11 09:07:30 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.93 2011/11/25 10:25:23 polynomial-c Exp $ + + 25 Nov 2011; Lars Wendler <polynomial-c@gentoo.org> + virtualbox-4.1.6-r1.ebuild, +files/virtualbox-4.1.6-yasm120-fix.patch: + Fixed compilation with dev-lang/yasm-1.2.0 (bug #391189). 11 Nov 2011; Lars Wendler <polynomial-c@gentoo.org> -files/virtualbox-4.1.0-vboxpci-build.patch: diff --git a/app-emulation/virtualbox/files/virtualbox-4.1.6-yasm120-fix.patch b/app-emulation/virtualbox/files/virtualbox-4.1.6-yasm120-fix.patch new file mode 100644 index 000000000000..d43809a0f98b --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-4.1.6-yasm120-fix.patch @@ -0,0 +1,29 @@ +# https://bugs.gentoo.org/391189 +# https://www.virtualbox.org/ticket/9932 +# https://www.virtualbox.org/changeset/39398 + +--- VirtualBox-4.1.6_OSE/src/VBox/VMM/testcase/tstAsmStructsAsm-lst.sed ++++ VirtualBox-4.1.6_OSE/src/VBox/VMM/testcase/tstAsmStructsAsm-lst.sed +@@ -13,11 +13,13 @@ + /^\.text$/d + /^\.data$/d + /^\.bss$/d ++s/[[:space:]][[:space:]]*/ /g + + # + # Figure which type of line this is and process it accordingly. + # + /^[[:alpha:]_][[:alnum:]_]*:/b struct ++/^[[:alpha:]_][[:alnum:]_]*_size EQU \$ - .*$/b struct_equ + /<gap>/b member + /^\.[[:alpha:]_][[:alnum:]_.:]* res.*$/b member_two + b error +@@ -27,6 +29,8 @@ + # + # Struct start / end. + # ++:struct_equ ++s/_size EQU.*$/_size/ + :struct + s/:$// + h diff --git a/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild index 5ab7fa91d175..e3673d025f86 100644 --- a/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild +++ b/app-emulation/virtualbox/virtualbox-4.1.6-r1.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.1.6-r1.ebuild,v 1.1 2011/11/06 23:39:53 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild,v 1.2 2011/11/25 10:25:23 polynomial-c Exp $ EAPI=4 @@ -168,6 +168,9 @@ src_prepare() { # Don't build vboxpci.ko module (D'oh!) epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch + # Fixed compilation with yasm-1.2.0 (bug #391189) + epatch "${FILESDIR}"/${P}-yasm120-fix.patch + # Use PAM only when pam USE flag is enbaled (bug #376531) if ! use pam ; then elog "Disabling PAM removes the possibility to use the VRDP features." |