Gentoo Archives: gentoo-commits

From: Doug Goldstein <cardoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/
Date: Fri, 04 Dec 2015 19:38:25
Message-Id: 1449257891.5e52bba8b60006a721f66527f194acae0410e4ce.cardoe@gentoo
1 commit: 5e52bba8b60006a721f66527f194acae0410e4ce
2 Author: Doug Goldstein <cardoe <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 4 19:36:22 2015 +0000
4 Commit: Doug Goldstein <cardoe <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 4 19:38:11 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e52bba8
7
8 app-emulation/xen: fix compilation failures
9
10 A patch referenced in src_prepare() was missing so the package could not
11 build. LDFLAGS were being passed in which caused build failures with
12 USE=-custom-cflags. Dependency on binutils was incorrect.
13
14 app-emulation/xen/xen-4.6.0-r2.ebuild | 7 +++++--
15 1 file changed, 5 insertions(+), 2 deletions(-)
16
17 diff --git a/app-emulation/xen/xen-4.6.0-r2.ebuild b/app-emulation/xen/xen-4.6.0-r2.ebuild
18 index 76febbc..3377511 100644
19 --- a/app-emulation/xen/xen-4.6.0-r2.ebuild
20 +++ b/app-emulation/xen/xen-4.6.0-r2.ebuild
21 @@ -28,7 +28,8 @@ else
22 SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
23 ${UPSTREAM_PATCHSET_URI}
24 ${SECURITY_PATCHSET_URI}
25 - ${GENTOO_PATCHSET_URI}"
26 + ${GENTOO_PATCHSET_URI}
27 + https://dev.gentoo.org/~idella4/distfiles/${PN}-security-patches.tar.gz"
28 fi
29
30 inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
31 @@ -41,7 +42,7 @@ IUSE="custom-cflags debug efi flask xsm"
32
33 DEPEND="${PYTHON_DEPS}
34 efi? ( >=sys-devel/binutils-2.22[multitarget] )
35 - !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
36 + !efi? ( >=sys-devel/binutils-2.22 )"
37 RDEPEND=""
38 PDEPEND="~app-emulation/xen-tools-${PV}"
39
40 @@ -151,6 +152,8 @@ src_configure() {
41 replace-flags -O3 -O2
42 else
43 unset CFLAGS
44 + unset LDFLAGS
45 + unset ASFLAGS
46 fi
47 }