Fixing build with --as-neeed wrt bug 320339. Thanks to Diego for reporting.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 42 insertions, 11 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/Manifest b/app-emulation/xen-tools/Manifest
index f98177ae69fd..a5f41893ef1d 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19
 AUX xen-tools-3.0.4_p1--as-needed.patch 517 RMD160 579721dff853f9762c649f17af86ef920b5e98eb SHA1 2cbf34f6daa27ff09a2d0e23396c775f0d2eb3e0 SHA256 37d64ba6b5b76f15d6300855a808ac632a1e228e9d3dc4bf8f3ddaac3d326c8a
@@ -17,7 +17,7 @@ AUX xen-tools-3.4.0-network-bridge-broadcast.patch 496 RMD160 3a8c57fe70837861f6
 AUX xen-tools-3.4.0-udevinfo.patch 610 RMD160 dd786337bc5be9dc5b0ef0f054b4aba7339208e5 SHA1 b203bfb1d5ee31692952d7b84e995401971ecff4 SHA256 687912b0a12960689abd02f11e96b8bb7e9fbf606a877394336534219d1c1b4a
 AUX xen-tools-3.4.1-xc_core-memset.patch 347 RMD160 06535aa08f52cf2cd6594a15db56129e1446f9e6 SHA1 0fca5a66a82b7f8477c6ce9f2c6e062a04e0a762 SHA256 4ca87102dc1487c3966449e4b7389ecd8844ffa6d8e9ef8fc5cb1264b10875b3
 AUX xen-tools-3.4.2-as-needed.patch 765 RMD160 dbb5ad2ec52e96c40f109e28c91b566e88cb6220 SHA1 9e38f5c06153b5293daa55abe00106404ff6555f SHA256 91f9bf0723462a70d025c8b7ce0dee50e170b68f1a22092f28d92b140a4e5772
-AUX xen-tools-4.0.0-as-needed.patch 765 RMD160 dbb5ad2ec52e96c40f109e28c91b566e88cb6220 SHA1 9e38f5c06153b5293daa55abe00106404ff6555f SHA256 91f9bf0723462a70d025c8b7ce0dee50e170b68f1a22092f28d92b140a4e5772
+AUX xen-tools-4.0.0-asneeded.patch 1192 RMD160 31e4baf4dfd990f8addfaef8356b59b763c00a7c SHA1 57e110ac3ae36d4a2eba4bed7f84d191168505e4 SHA256 08b5a29ebdd5321135f472c5335bed3141a48aaff6928d08ffff003bbf52de8f
 AUX xend.initd 1291 RMD160 96659d237688d0c42e5c30491ad883d4af0f1c0f SHA1 2ffe2b29df7014d1dbf69f850a23a95e1b294288 SHA256 41ae7f38565a477abc1fb8ac5af9d6285bf90d171b922c6413aa8aefe5b00889
 AUX xend.initd-r1 1664 RMD160 8d7ea19e96c49631a8f432dd93ae91ca4f37d26b SHA1 bd3a8f083288cd89624d31f3c7932e1a831d99a3 SHA256 6ea8848ca1203c5ef8490014ded86ec67100385c217660d393b25dc6519d254d
 AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
@@ -38,13 +38,15 @@ EBUILD xen-tools-3.4.0.ebuild 6942 RMD160 8a12d902da29fa1c6c859a13ecbe8b6096a657
 EBUILD xen-tools-3.4.1-r1.ebuild 7047 RMD160 dfc25efb8f3117b0d9e176317b07b9ee37371126 SHA1 eb9bc86b91122bfb2fe6374060ac937eb3897d88 SHA256 0abf697214ea09fbec3d0d5af542804604fa5ea3eef3ef06b66de4b44b22aa54
 EBUILD xen-tools-3.4.1.ebuild 7019 RMD160 c4c5eda3b843e5ee8f50d4201f37b62cece3b80a SHA1 52186225682429a4b68447b7743445b973cf1f83 SHA256 f25b234321a35d92fa88084f5b871821abc9073be8c4ff0fd53e9e87e0080e7b
 EBUILD xen-tools-3.4.2.ebuild 7132 RMD160 b40beed992e9ce6b581df88c50a4749b331a560b SHA1 ebcdfc085dda55b54ee4a560a4255b8ea26e487c SHA256 0ac95dfa54d8646d31653aaad2b961cde912dae9e33204add6627fad23fe6c11
-EBUILD xen-tools-4.0.0.ebuild 8036 RMD160 be5332726012a84568ba5c9b81ef82131e532c37 SHA1 7f70c13ccc9099b524c5bd5727495d63d9d0d164 SHA256 e998820e90635fc9f1f90b7bf1951386dbd4d3d9c1c22394d14b6fe07c34f06d
-MISC ChangeLog 15973 RMD160 1fe7ec8da5f6cc173a009a5748dc19ff780747b8 SHA1 8f3f963dc48c62201888242510b2295eedff9f09 SHA256 c6d55e5da852bbff38c6605d10b0bad5f7f5ab69cb495dc1f9eb98f962003a5e
+EBUILD xen-tools-4.0.0.ebuild 8110 RMD160 04f9c70d62d1ad97d5fb66611e7358cffba3533b SHA1 b5769ae4490cd7df584e7dad29e85159d5abc839 SHA256 04aa6f27bd40f35085f619b8a54c8dd5837ca1e2c470e0948c46db6af38f87ac
+MISC ChangeLog 16218 RMD160 1c173e8474f664fcfcc294af27f9002936bbe922 SHA1 0de004f204263933cb850a3c3f3b00a004a5cdfc SHA256 f12a21eb84c884ab260a9db299b5044a6427d679dd9194c1debe272b6defcbf3
 MISC metadata.xml 721 RMD160 af4a7d279110ca38f4252f2723a86c628d413b23 SHA1 77cf6f5f1a56f928e4d9b0ebe373372d75f314d1 SHA256 670188614bc7d1e2b4c027ac559559cf2228b28f1b1289acef62206e784e6a53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwit2sACgkQmWq1bYTyC0O5HgD8D6Lv6B8zYUX1ZH741f5U0y8I
-OHGYzHbAA/XnTB4sso4A/1aid2Idlt35BGFRSBzF7+FXnYw/iGUJ4R7+aomYcY9f
-=8XeF
+iJwEAQECAAYFAkwk3NYACgkQIiMqcbOVdxQBUAP9FUIS34ilq1fYglyphrcNnOZv
+I/IJk08eaoaodoy2dGX+BZCjdpl0iWr+WKSathcyjNTEzwDC1+wqWAVgLekv62ry
+a95D4dbbRuMOSRUa6MxesYi//+acuLV5muZeUrtt45XDOfD2cI0QwtxdM7MY9bw2
+aahxOpv+WZFK45vJKGA=
+=JCIZ
 -----END PGP SIGNATURE-----
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"
 }