diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2013-02-10 08:20:23 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2013-02-10 08:20:23 +0000 |
| commit | 71f0909be6272d79da292b06236db8acf432e3c2 (patch) | |
| tree | 655fad11f9a34464d327866171157b9a266b20c4 /app-emulation/xen-pvgrub | |
| parent | Cleanup masked package (diff) | |
| download | gentoo-2-71f0909be6272d79da292b06236db8acf432e3c2.tar.gz gentoo-2-71f0909be6272d79da292b06236db8acf432e3c2.tar.bz2 gentoo-2-71f0909be6272d79da292b06236db8acf432e3c2.zip | |
Added -CC.patch offered, tested by, and thanks to, Tomoatsu Shimada, Bug #455196
(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'app-emulation/xen-pvgrub')
| -rw-r--r-- | app-emulation/xen-pvgrub/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/xen-pvgrub/files/xen-4.2.1-CC.patch | 12 | ||||
| -rw-r--r-- | app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild | 9 |
3 files changed, 22 insertions, 6 deletions
diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog index dce2ff7a0d5b..798457baa9d6 100644 --- a/app-emulation/xen-pvgrub/ChangeLog +++ b/app-emulation/xen-pvgrub/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/xen-pvgrub # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.20 2013/02/04 05:52:15 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.21 2013/02/10 08:20:23 idella4 Exp $ + + 10 Feb 2013; Ian Delaney <idella4@gentoo.org> +files/xen-4.2.1-CC.patch, + xen-pvgrub-4.2.1-r1.ebuild: + Added -CC.patch offered, tested by, and thanks to, Tomoatsu Shimada, Bug + #455196 04 Feb 2013; Ian Delaney <idella4@gentoo.org> files/xen-4.2.0-jserver.patch, xen-pvgrub-4.2.0-r1.ebuild, xen-pvgrub-4.2.1-r1.ebuild: diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.1-CC.patch b/app-emulation/xen-pvgrub/files/xen-4.2.1-CC.patch new file mode 100644 index 000000000000..9280e38d9851 --- /dev/null +++ b/app-emulation/xen-pvgrub/files/xen-4.2.1-CC.patch @@ -0,0 +1,12 @@ +diff -ur xen-4.2.1.orig/stubdom/Makefile xen-4.2.1/stubdom/Makefile +--- stubdom/Makefile 2012-12-17 23:00:06.000000000 +0800 ++++ stubdom/Makefile 2013-02-10 16:01:01.883644638 +0800 +@@ -130,7 +130,7 @@ + cross-zlib: $(ZLIB_STAMPFILE) + $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) + ( cd $< && \ +- CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \ ++ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \ + $(MAKE) DESTDIR= libz.a && \ + $(MAKE) DESTDIR= install ) + diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild index ea3084950dd5..558bbb328edb 100644 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild,v 1.2 2013/02/04 05:52:15 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild,v 1.3 2013/02/10 08:20:23 idella4 Exp $ EAPI=4 PYTHON_DEPEND="2:2.6" @@ -58,10 +58,6 @@ src_prepare() { $DISTDIR/newlib-1.16.0.tar.gz \ $DISTDIR/grub-0.97.tar.gz \ ./stubdom/ || die "files not coped to stubdom" - # Note: tip to patch grub gentoo style, for review soon. This is around 1/3. -# cp "${WORKDIR}"/patch/{00[3-6]_all_grub*,010_all_grub*,01[3-9]_all_grub*,0[6-7]0_all_grub*} \ -# "${WORKDIR}"/patch/{110_all_grub*,300_all_grub*} \ -# stubdom/grub.patches/ || die einfo "files copied to stubdom" # Patch the unmergeable newlib, fix most of the leftover gcc QA issues @@ -78,6 +74,9 @@ src_prepare() { #Sec patch epatch "${FILESDIR}"/${PN/-pvgrub/}-4-CVE-2012-6075-XSA-41.patch + + # wrt Bug #455196 + epatch "${FILESDIR}"/${P/-pvgrub/}-CC.patch } src_compile() { |