diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-06-25 16:43:55 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-06-25 16:43:55 +0000 |
| commit | 0de98e847a1e3675d39a15cf692555aa07bf1df6 (patch) | |
| tree | 9d884499a76e3cf4170ac1c69c25cb5d7cc6e5b9 /app-emulation/xen-tools | |
| parent | Include static lib support, force to pic (diff) | |
| download | gentoo-2-0de98e847a1e3675d39a15cf692555aa07bf1df6.tar.gz gentoo-2-0de98e847a1e3675d39a15cf692555aa07bf1df6.tar.bz2 gentoo-2-0de98e847a1e3675d39a15cf692555aa07bf1df6.zip | |
Fixing build with --as-neeed wrt bug 320339. Thanks to Diego for reporting.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/xen-tools')
| -rw-r--r-- | app-emulation/xen-tools/ChangeLog | 8 | ||||
| -rw-r--r-- | app-emulation/xen-tools/files/xen-tools-4.0.0-asneeded.patch (renamed from app-emulation/xen-tools/files/xen-tools-4.0.0-as-needed.patch) | 24 | ||||
| -rw-r--r-- | app-emulation/xen-tools/xen-tools-4.0.0.ebuild | 5 |
3 files changed, 33 insertions, 4 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog index 065414c2df9b..35025d2a95e8 100644 --- a/app-emulation/xen-tools/ChangeLog +++ b/app-emulation/xen-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/xen-tools # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.62 2010/06/24 01:39:26 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.63 2010/06/25 16:43:55 xarthisius Exp $ + + 25 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> + xen-tools-4.0.0.ebuild, -files/xen-tools-4.0.0-as-needed.patch, + +files/xen-tools-4.0.0-asneeded.patch: + Fixing build with --as-neeed wrt bug 320339. Thanks to Diego for + reporting. 24 Jun 2010; Christoph Mende <angelos@gentoo.org> xen-tools-3.4.2.ebuild: Stable on amd64 wrt bug #293714 diff --git a/app-emulation/xen-tools/files/xen-tools-4.0.0-as-needed.patch b/app-emulation/xen-tools/files/xen-tools-4.0.0-asneeded.patch index 5d973732fb31..abb2cf1781f4 100644 --- a/app-emulation/xen-tools/files/xen-tools-4.0.0-as-needed.patch +++ b/app-emulation/xen-tools/files/xen-tools-4.0.0-asneeded.patch @@ -1,5 +1,25 @@ ---- xen-3.4.2.orig/tools/libxc/Makefile 2009-11-10 16:12:56.000000000 +0100 -+++ xen-3.4.2/tools/libxc/Makefile 2009-12-12 18:46:27.547714651 +0100 +--- tools/xenpaging/Makefile ++++ tools/xenpaging/Makefile +@@ -4,7 +4,7 @@ + CFLAGS += -I $(XEN_XC) + CFLAGS += -I ./ + CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) +-LDFLAGS += $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) ++xenpaging_LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) + + POLICY = default + +@@ -27,7 +27,7 @@ + all: $(IBINS) + + xenpaging: $(OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(xenpaging_LIBS) + + install: all + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) +--- tools/libxc/Makefile ++++ tools/libxc/Makefile @@ -167,9 +167,8 @@ xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D) xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D) diff --git a/app-emulation/xen-tools/xen-tools-4.0.0.ebuild b/app-emulation/xen-tools/xen-tools-4.0.0.ebuild index 26a2fa4824a3..12857efa4008 100644 --- a/app-emulation/xen-tools/xen-tools-4.0.0.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.0.0.ebuild,v 1.3 2010/06/09 16:50:18 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.0.0.ebuild,v 1.4 2010/06/25 16:43:55 xarthisius Exp $ EAPI="3" @@ -153,6 +153,9 @@ src_prepare() { # fix variable declaration to avoid sandbox issue, #253134 epatch "${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch" + # fix --as-needed, #320339 + epatch "${FILESDIR}/${P}-asneeded.patch" + # fix gcc 4.4 failure #epatch "${FILESDIR}/${PN}-3.4.1-xc_core-memset.patch" } |