Fix linking with -Wl,--no-undefined wrt #246748 by Christian Ruppert.

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

4 files changed, 25 insertions, 5 deletions

diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog
index 9b61f99147a4..ba2cc520db9e 100644
--- a/dev-libs/libxslt/ChangeLog
+++ b/dev-libs/libxslt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libxslt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.191 2009/10/07 14:39:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.192 2009/10/07 15:31:58 ssuominen Exp $
+
+  07 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> libxslt-1.1.26.ebuild,
+  +files/libxslt-1.1.26-undefined.patch:
+  Fix linking with -Wl,--no-undefined wrt #246748 by Christian Ruppert.
 
 *libxslt-1.1.26 (07 Oct 2009)
 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index f8174fbc8bea..f90f0be92574 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,10 +1,11 @@
 AUX libxslt-1.1.23-parallel-install.patch 578 RMD160 b944d9886516e676ec60f7657011d524bff5bba5 SHA1 716cfb859d93acf7b6e5c411e65a7842f396066a SHA256 9b2fa23d7a4fef60c8acec7e8003bc42f4a4c9c1dbd5e035aa54af3e8ccecd5a
 AUX libxslt-1.1.24-exslt_crypt.patch 4906 RMD160 fbdbea30ec2180b3093cf71f9119ad0287fa8be4 SHA1 018183759b431aaabe094ecadbdb30df80613dd8 SHA256 d21b61608d4bd05e99270bbfaa46238157ae72e6869cac519bb11653d508f0dd
+AUX libxslt-1.1.26-undefined.patch 616 RMD160 571771b9fd262df841442b4d8b0db1922529a7d3 SHA1 fcc3730b2466e08ac443ea05e0fff5877f9e2624 SHA256 bcd05d121d9857181037ec5d9740fff51640ee2e4a7c5933c9d65f7ee6011062
 AUX libxslt.m4-libxslt-1.1.26.patch 1421 RMD160 f54116e3871afaa97daf5bbb832f2147d395077b SHA1 cdf3aa89083371b45e88c67cc53b9303cd13f2f8 SHA256 c02cd8437064db0921c08e63245c403dad12410d2997715aa7aa36600bfaa895
 AUX libxslt.m4-libxslt-1.1.8.patch 1292 RMD160 0dcd21978aa0102784df670f2c9835da227f42c8 SHA1 ffa3c5ff84b0636ec4238167e324d377305c4d34 SHA256 0da59fb6cb50bf30e8ac79644df90394707ac07e60337aa3c0e53986781e9e0d
 DIST libxslt-1.1.24.tar.gz 3363961 RMD160 41e7721eeed722c45310877d045422b47ab32973 SHA1 b5402e24abff5545ed76f6a55049cbebc664bd58 SHA256 c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e
 DIST libxslt-1.1.26.tar.gz 3401513 RMD160 fc7630352ae5772d25fc8132a373d477fb8d8d5f SHA1 69f74df8228b504a87e2b257c2d5238281c65154 SHA256 55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1
 EBUILD libxslt-1.1.24-r1.ebuild 1989 RMD160 60766cedca2cb4a2f6ed98b8225ecdb199e5357e SHA1 e07a57823fc3cfb5e98c9bfee4e0cb539b8800f4 SHA256 e7e64141c382574141e3015664dcd67cc827353460e495c5c158ac40d612b148
-EBUILD libxslt-1.1.26.ebuild 1249 RMD160 6db4543494627bc2dc68b36378482dc195969cd5 SHA1 66c25babe5c001e04eaa5ad0830b31a638c206b2 SHA256 0bbdf55a6cebf50b1dbcc0a317bed0c5d305ff7065533161ddfe210c8827b664
-MISC ChangeLog 22968 RMD160 40e707c7f94c8e0051ff4203db356bac58586566 SHA1 4b56d37c3d7ce80a6d92e012f74ed716781e7a5a SHA256 0b896c020f1c030c331d9aee3ac780c6de9288526a62a8030bb3d086f482e59d
+EBUILD libxslt-1.1.26.ebuild 1288 RMD160 950664e6227a618248a26d7545c2c0cd21fcc367 SHA1 04664c3a6f05296717979f9deca7fbf52eb45760 SHA256 87499016ca6b52c8f757e6462c69cc469ef257278385a63184d8950cf37046e6
+MISC ChangeLog 23159 RMD160 5809d8b7203db2ad31a73eb32af9f05c0b2e2cee SHA1 5af3449a5efdb37b9973dd1b8f4ec47ef9d24a43 SHA256 93725ee518f71cccc0e46a52dcaee2bf687bcb3dc9f420ea201a3fda3b1c2d30
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/dev-libs/libxslt/files/libxslt-1.1.26-undefined.patch b/dev-libs/libxslt/files/libxslt-1.1.26-undefined.patch
new file mode 100644
index 000000000000..364276a809d8
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.26-undefined.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/show_bug.cgi?id=246748
+
+diff -ur libxslt-1.1.26.orig/python/Makefile.am libxslt-1.1.26/python/Makefile.am
+--- libxslt-1.1.26.orig/python/Makefile.am	2009-05-12 09:29:34.000000000 +0300
++++ libxslt-1.1.26/python/Makefile.am	2009-10-07 18:27:35.000000000 +0300
+@@ -36,7 +36,7 @@
+ python_LTLIBRARIES = libxsltmod.la
+ 
+ libxsltmod_la_SOURCES = libxslt.c types.c libxslt-py.c
+-libxsltmod_la_LIBADD = $(mylibs) 
++libxsltmod_la_LIBADD = $(mylibs)  -lpython$(PYTHON_VERSION)
+ 
+ libxslt.py: $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py
+ 	cat $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py > libxslt.py
diff --git a/dev-libs/libxslt/libxslt-1.1.26.ebuild b/dev-libs/libxslt/libxslt-1.1.26.ebuild
index a276ab078a99..dba15e27c2b4 100644
--- a/dev-libs/libxslt/libxslt-1.1.26.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.26.ebuild,v 1.1 2009/10/07 14:39:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.26.ebuild,v 1.2 2009/10/07 15:31:58 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -21,7 +21,8 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/libxslt.m4-${P}.patch \
-		"${FILESDIR}"/${PN}-1.1.23-parallel-install.patch
+		"${FILESDIR}"/${PN}-1.1.23-parallel-install.patch \
+		"${FILESDIR}"/${P}-undefined.patch
 	eautoreconf
 	epunt_cxx
 }