diff options
| -rw-r--r-- | app-emulation/xen-tools/ChangeLog | 8 | ||||
| -rw-r--r-- | app-emulation/xen-tools/files/xen-tools-3.4.2-as-needed.patch | 13 | ||||
| -rw-r--r-- | app-emulation/xen-tools/xen-tools-3.4.2.ebuild | 7 |
3 files changed, 24 insertions, 4 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog index 0daee536d920..32c3587baa7b 100644 --- a/app-emulation/xen-tools/ChangeLog +++ b/app-emulation/xen-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/xen-tools -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.56 2009/12/01 13:39:18 patrick Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.57 2010/01/16 15:01:40 fauli Exp $ + + 16 Jan 2010; Christian Faulhammer <fauli@gentoo.org> + xen-tools-3.4.2.ebuild, +files/xen-tools-3.4.2-as-needed.patch: + fix issues with --as-needed, patch by Kacper Kowalik in bug 296631 *xen-tools-3.4.2 (01 Dec 2009) diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-as-needed.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-as-needed.patch new file mode 100644 index 000000000000..5d973732fb31 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-tools-3.4.2-as-needed.patch @@ -0,0 +1,13 @@ +--- 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 +@@ -167,9 +167,8 @@ + xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D) + xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D) + +-libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l) + libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so +- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) $(call zlib-options,l) + + -include $(DEPS) + diff --git a/app-emulation/xen-tools/xen-tools-3.4.2.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2.ebuild index 619715574972..44b06f2c7fab 100644 --- a/app-emulation/xen-tools/xen-tools-3.4.2.ebuild +++ b/app-emulation/xen-tools/xen-tools-3.4.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# 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-3.4.2.ebuild,v 1.1 2009/12/01 13:39:18 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2.ebuild,v 1.2 2010/01/16 15:01:40 fauli Exp $ EAPI="2" @@ -128,6 +128,9 @@ src_prepare() { # fix gcc 4.4 failure #epatch "${FILESDIR}/${PN}-3.4.1-xc_core-memset.patch" + + # Fix --as-needed issues, bug 296631 + epatch "${FILESDIR}/${P}-as-needed.patch" } src_compile() { |